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.cpp | |
| 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.cpp')
| -rw-r--r-- | indra/llui/llclipboard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp index fc3967f5bf..b5c46cdff1 100644 --- a/indra/llui/llclipboard.cpp +++ b/indra/llui/llclipboard.cpp @@ -61,7 +61,7 @@ void LLClipboard::copyFromSubstring(const LLWString &src, S32 pos, S32 len, cons } -LLWString LLClipboard::getPasteWString( LLUUID* source_id ) +const LLWString& LLClipboard::getPasteWString( LLUUID* source_id ) { if( mSourceID.notNull() ) { @@ -88,7 +88,7 @@ LLWString LLClipboard::getPasteWString( LLUUID* source_id ) } -BOOL LLClipboard::canPasteString() +BOOL LLClipboard::canPasteString() const { return LLView::getWindow()->isClipboardTextAvailable(); } |