diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-02-01 19:09:29 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-02-01 19:09:29 -0800 |
| commit | c1636911c84f948e542f445d3c7495e6df185912 (patch) | |
| tree | 6813798d77b782f834ee37c7df5b344f6d80386e /indra/llui/llclipboard.h | |
| parent | 3249a1ced0a4d0bc45d04f5794c989e12e62033b (diff) | |
EXP-1862 : Make LLClipboard an LLSingleton and clean up the internals (set up for toolbar and never used)
Diffstat (limited to 'indra/llui/llclipboard.h')
| -rw-r--r-- | indra/llui/llclipboard.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/indra/llui/llclipboard.h b/indra/llui/llclipboard.h index 9371b94284..2567eaab48 100644 --- a/indra/llui/llclipboard.h +++ b/indra/llui/llclipboard.h @@ -31,10 +31,10 @@ #include "llstring.h" #include "lluuid.h" #include "stdenums.h" +#include "llsingleton.h" #include "llinventory.h" - -class LLClipboard +class LLClipboard : public LLSingleton<LLClipboard> { public: LLClipboard(); @@ -54,19 +54,12 @@ 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; } + // Support clipboard for object known only by their uuid + void setSourceObject(const LLUUID& source_id) { mSourceID = source_id; } private: LLUUID mSourceID; LLWString mString; - LLInventoryObject* mSourceItem; }; - -// Global singleton -extern LLClipboard gClipboard; - - #endif // LL_LLCLIPBOARD_H |