diff options
| author | niel@nirvana-win7hp.planescape.home <niel@nirvana-win7hp.planescape.home> | 2011-10-26 01:42:26 +0100 |
|---|---|---|
| committer | niel@nirvana-win7hp.planescape.home <niel@nirvana-win7hp.planescape.home> | 2011-10-26 01:42:26 +0100 |
| commit | 4fd9a53115bf85ffe17974323d5fa609e0df960c (patch) | |
| tree | 7968008d0fa7c0347d637e1fb19add9d436b926d /indra/llui/llclipboard.h | |
| parent | 42c166e451d362609d83fb17261f9e8f344e974d (diff) | |
| parent | b7a349f231977d5917b29faacca143a85d925576 (diff) | |
Merge STORM-959
Diffstat (limited to 'indra/llui/llclipboard.h')
| -rw-r--r-- | indra/llui/llclipboard.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/llclipboard.h b/indra/llui/llclipboard.h index 24cb46c3f4..9371b94284 100644 --- a/indra/llui/llclipboard.h +++ b/indra/llui/llclipboard.h @@ -30,6 +30,8 @@ #include "llstring.h" #include "lluuid.h" +#include "stdenums.h" +#include "llinventory.h" class LLClipboard @@ -52,9 +54,14 @@ public: BOOL canPastePrimaryString() const; const LLWString& getPastePrimaryWString(LLUUID* source_id = NULL); + // Support clipboard for object known only by their uuid and asset type + void setSourceObject(const LLUUID& source_id, LLAssetType::EType type); + const LLInventoryObject* getSourceObject() { return mSourceItem; } + private: - LLUUID mSourceID; + LLUUID mSourceID; LLWString mString; + LLInventoryObject* mSourceItem; }; |