summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-03-09 17:34:30 -0800
committerMerov Linden <merov@lindenlab.com>2012-03-09 17:34:30 -0800
commit8a792a86fad7c610651b964d164b8f099c790562 (patch)
tree406cf52008aea0185e04391e01f5f4ee5f715367 /indra
parent4ffad9495cdf6f5d6577c4829628fc78bb32b817 (diff)
EXP-1913 : Suppress the text concatenation on clipboard, unused and confusing.
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llclipboard.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp
index 53b1b855de..7bf62b5bfc 100644
--- a/indra/llui/llclipboard.cpp
+++ b/indra/llui/llclipboard.cpp
@@ -122,15 +122,7 @@ bool LLClipboard::copyToClipboard(const LLWString &src, S32 pos, S32 len, bool u
// Concatenate the input string to the LL and the system clipboard
bool LLClipboard::addToClipboard(const LLWString &src, S32 pos, S32 len, bool use_primary)
{
- const LLWString sep(utf8str_to_wstring(std::string(", ")));
- if (mString.length() == 0)
- {
- mString = src.substr(pos, len);
- }
- else
- {
- mString = mString + sep + src.substr(pos, len);
- }
+ mString = src.substr(pos, len);
return (use_primary ? LLView::getWindow()->copyTextToPrimary(mString) : LLView::getWindow()->copyTextToClipboard(mString));
}