diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/llui/llclipboard.h | |
parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/llui/llclipboard.h')
-rw-r--r-- | indra/llui/llclipboard.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/indra/llui/llclipboard.h b/indra/llui/llclipboard.h index 999a17acc2..31ebd04826 100644 --- a/indra/llui/llclipboard.h +++ b/indra/llui/llclipboard.h @@ -36,24 +36,20 @@ #include "llstring.h" #include "lluuid.h" -// -// Classes -// + class LLClipboard { -protected: - LLUUID mSourceID; - LLWString mString; - public: LLClipboard(); ~LLClipboard(); void copyFromSubstring(const LLWString ©_from, S32 pos, S32 len, const LLUUID& source_id = LLUUID::null ); - - - BOOL canPasteString(); - LLWString getPasteWString(LLUUID* source_id = NULL); + BOOL canPasteString() const; + const LLWString& getPasteWString(LLUUID* source_id = NULL); + +private: + LLUUID mSourceID; + LLWString mString; }; |