diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-13 21:37:54 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-13 21:37:54 -0700 |
| commit | 9dfb6284df315588b0a387725965e3626d63784c (patch) | |
| tree | 2b80ad4c35cde6fd3d9d95761b1f24bc02024852 /indra/llui/llclipboard.cpp | |
| parent | 82700548058527001657758888cf79df099064b3 (diff) | |
EXP-1924 : Relax the cconsistency policy between text and UUID on the clipboard.
Diffstat (limited to 'indra/llui/llclipboard.cpp')
| -rw-r--r-- | indra/llui/llclipboard.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp index 7bf62b5bfc..14173fdbb0 100644 --- a/indra/llui/llclipboard.cpp +++ b/indra/llui/llclipboard.cpp @@ -133,11 +133,6 @@ bool LLClipboard::pasteFromClipboard(LLWString &dst, bool use_primary) bool res = (use_primary ? LLView::getWindow()->pasteTextFromPrimary(dst) : LLView::getWindow()->pasteTextFromClipboard(dst)); if (res) { - if (dst != mString) - { - // Invalidate the LL clipboard if the System had a different string in it (i.e. some copy/cut was done in some other app) - reset(); - } mString = dst; } return res; |