summaryrefslogtreecommitdiff
path: root/indra/llui/llclipboard.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-04 12:17:01 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-04 12:17:01 -0700
commitfc6c3fbe4271dcd9b64bdfd417514dc97ad7dd75 (patch)
treebd09a20a2b4dd9384a92114eaeebe0d5bfac8e1e /indra/llui/llclipboard.cpp
parentf3aac4c8ab45d52c4f038ad1a16768d9d8e0b201 (diff)
parent44e9fb446f3c92c3dfd9b5be8a3e02ec5a44ba00 (diff)
Merge with latest
Diffstat (limited to 'indra/llui/llclipboard.cpp')
-rw-r--r--indra/llui/llclipboard.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp
index 984c4ec5fb..6910b962a1 100644
--- a/indra/llui/llclipboard.cpp
+++ b/indra/llui/llclipboard.cpp
@@ -40,6 +40,7 @@ LLClipboard gClipboard;
LLClipboard::LLClipboard()
{
+ mSourceItem = NULL;
}
@@ -134,3 +135,8 @@ BOOL LLClipboard::canPastePrimaryString() const
{
return LLView::getWindow()->isPrimaryTextAvailable();
}
+
+void LLClipboard::setSourceObject(const LLUUID& source_id, LLAssetType::EType type)
+{
+ mSourceItem = new LLInventoryObject (source_id, LLUUID::null, type, "");
+}