summaryrefslogtreecommitdiff
path: root/indra/llui/llclipboard.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-05 13:01:29 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-05 13:01:29 -0700
commite61da057397f95e0dcf8bf964e2836d3d4a80c20 (patch)
tree14ce479af039aee249a91b1024224de8b3a09322 /indra/llui/llclipboard.cpp
parent194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff)
parentfb7af4d0010f9d14cb5464bed83d9e022dbe0d1a (diff)
merge with viewer-development
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, "");
+}