From 667e5d196817dffa7eb68ec53dd02ac7a66d0ea2 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 22 Jun 2012 14:59:40 -0500
Subject: Merge cleanup

---
 indra/newview/llinventorybridge.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llinventorybridge.cpp')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index fd0c6f8c3c..b86c453d61 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3008,6 +3008,8 @@ void LLFolderBridge::pasteFromClipboard()
 			}
 		}
 
+		const LLUUID parent_id(mUUID);
+
 		for (LLDynamicArray<LLUUID>::const_iterator iter = objects.begin();
 			 iter != objects.end();
 			 ++iter)
-- 
cgit v1.2.3