From bb6ace0672fa5e1c47c534ba74396ef04daa408b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 17 Feb 2012 14:42:12 -0800
Subject: EXP-1902, EXP-1903 : Move items cut to the trash when clipboard
 reset.

---
 indra/llui/llclipboard.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/llui/llclipboard.cpp')

diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp
index ee1f1aa816..e0729366cc 100644
--- a/indra/llui/llclipboard.cpp
+++ b/indra/llui/llclipboard.cpp
@@ -47,9 +47,17 @@ LLClipboard::~LLClipboard()
 
 void LLClipboard::reset()
 {
+	// Increment the clipboard state
 	mState++;
+	// Call the cleanup function (if any) before releasing the object list
+	if (mCutMode && mCleanupCallback)
+	{
+		mCleanupCallback();
+	}
+	// Clear the clipboard
 	mObjects.reset();
 	mCutMode = false;
+	mCleanupCallback = NULL;
 	mString = LLWString();
 }
 
-- 
cgit v1.2.3