From a71b0584db4a4c9731dc5ea82dff12c38af92993 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 25 Apr 2018 23:11:21 +0200 Subject: [PATCH 1/2] FIRE-22530: Copy & paste from chat history using chat headers is missing line breaks --- indra/newview/fschathistory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp index 0f0048c5e1..4da29a4aa7 100644 --- a/indra/newview/fschathistory.cpp +++ b/indra/newview/fschathistory.cpp @@ -1513,7 +1513,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL std::string widget_associated_text = "\n"; if (needs_header_text) { - widget_associated_text = "[" + chat.mTimeStr + "] "; + widget_associated_text += "[" + chat.mTimeStr + "] "; if (utf8str_trim(chat.mFromName).size() != 0 && chat.mFromName != SYSTEM_FROM) { widget_associated_text += chat.mFromName + delimiter; From 4bc58e41c269c2fd28fb9839c6cc196872e68e89 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 26 Apr 2018 00:23:11 +0200 Subject: [PATCH 2/2] Fix position of lock icon in preview floaters --- indra/newview/skins/default/xui/en/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/en/floater_script_preview.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index 3442ce85c3..03c0ddc9b3 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -33,7 +33,7 @@ left="322" mouse_opaque="true" name="lock" - top="4" + top="1" width="18" />