summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-22 14:59:40 -0500
committerDave Parks <davep@lindenlab.com>2012-06-22 14:59:40 -0500
commit667e5d196817dffa7eb68ec53dd02ac7a66d0ea2 (patch)
treed81607c82abc142d0b747f8dd64dd1d0509bbdb4 /indra/newview/llinventorybridge.cpp
parent9e9d32de384b2807f195be48f49fbdec725f45d1 (diff)
Merge cleanup
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 2 insertions, 0 deletions
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)