diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
commit | fa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch) | |
tree | 3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/llui/llclipboard.cpp | |
parent | fae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff) | |
parent | d2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff) |
merge up from viewer-pre-beta
Diffstat (limited to 'indra/llui/llclipboard.cpp')
-rw-r--r-- | indra/llui/llclipboard.cpp | 6 |
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, ""); +} |