diff options
author | Merov Linden <merov@lindenlab.com> | 2012-03-09 14:20:31 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-03-09 14:20:31 -0800 |
commit | 5cf3f8e3c813d978f318fd59ad422c75b3e171cd (patch) | |
tree | f21777abd579be2351820d74d0859dab3d1d3b4d /indra | |
parent | 5170f18d3cecc757cae2779d9e271272e24d160b (diff) |
EXP-1913 : Prevent text clipboard to zap inventory clipboard
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llui/llclipboard.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp index cc5b219e6f..53b1b855de 100644 --- a/indra/llui/llclipboard.cpp +++ b/indra/llui/llclipboard.cpp @@ -116,7 +116,6 @@ bool LLClipboard::isOnClipboard(const LLUUID& object) const // Copy the input string to the LL and the system clipboard bool LLClipboard::copyToClipboard(const LLWString &src, S32 pos, S32 len, bool use_primary) { - reset(); return addToClipboard(src, pos, len, use_primary); } @@ -132,7 +131,6 @@ bool LLClipboard::addToClipboard(const LLWString &src, S32 pos, S32 len, bool us { mString = mString + sep + src.substr(pos, len); } - mGeneration++; return (use_primary ? LLView::getWindow()->copyTextToPrimary(mString) : LLView::getWindow()->copyTextToClipboard(mString)); } |