From 21a36e2c5b9dc98a1eca4a00088ea89f914d15b4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 18 Nov 2014 12:15:30 +0100 Subject: MAINT-4677: Unexpected behaviour when blocking objects with a / in their name when using compact chat view --- indra/newview/llpanelprofile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index f91c4110c0..e795e7eedb 100755 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -168,7 +168,7 @@ public: { if (params.size() > 2) { - const std::string object_name = params[2].asString(); + const std::string object_name = LLURI::unescape(params[2].asString()); LLMute mute(avatar_id, object_name, LLMute::OBJECT); LLMuteList::getInstance()->add(mute); LLPanelBlockedList::showPanelAndSelect(mute.mID); -- cgit v1.2.3 From 38703d62e382bf7e57a0d3c2ab55714e99889e32 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 20 Nov 2014 08:37:55 -0500 Subject: STORM-2085 Spelling error and duplicate entry in notifications.xml --- indra/newview/skins/default/xui/en/notifications.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f1d34a1449..83384e0902 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3792,17 +3792,6 @@ Leave Group? yestext="OK"/> - -Unable to leave group: [reason]. - reason - - - Unable to leave group: [reason]. -- cgit v1.2.3 From 2e0d7ce282c007d791301ac73ff58c39dd40af81 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 21 Nov 2014 06:46:43 -0500 Subject: STORM-2085 Remove additional duplicate entry GroupDepart --- indra/newview/skins/default/xui/en/notifications.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 83384e0902..05bda0259d 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3792,17 +3792,6 @@ Leave Group? yestext="OK"/> - -You have left the group [group_name]. - group_name - - - Date: Fri, 5 Dec 2014 09:46:07 -0500 Subject: STORM-2088 Minimap no longer remembers zoom setting between sessions --- indra/newview/llnetmap.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 1685a18e26..fbd9b127b6 100755 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -97,13 +97,13 @@ LLNetMap::LLNetMap (const Params & p) mToolTipMsg(), mPopupMenu(NULL) { + mScale = gSavedSettings.getF32("MiniMapScale"); + mPixelsPerMeter = mScale / REGION_WIDTH_METERS; mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); - setScale(gSavedSettings.getF32("MiniMapScale")); } LLNetMap::~LLNetMap() { - gSavedSettings.setF32("MiniMapScale", mScale); } BOOL LLNetMap::postBuild() @@ -138,6 +138,8 @@ void LLNetMap::setScale( F32 scale ) mPixelsPerMeter = mScale / REGION_WIDTH_METERS; mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); + gSavedSettings.setF32("MiniMapScale", mScale); + mUpdateNow = true; } -- cgit v1.2.3 From a6dfe5a64ef984aa1a3169c72b490983662f899f Mon Sep 17 00:00:00 2001 From: Cinder Date: Sun, 28 Dec 2014 14:18:29 -0700 Subject: STORM-2098 - Don't enable object edit for an invalid agent --- indra/newview/llviewermenu.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 3abeba4b43..e190119bcd 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2830,6 +2830,8 @@ BOOL enable_object_build(void*) bool enable_object_edit() { + if (!isAgentAvatarValid()) return false; + // *HACK: The new "prelude" Help Islands have a build sandbox area, // so users need the Edit and Create pie menu options when they are // there. Eventually this needs to be replaced with code that only -- cgit v1.2.3 From 4c96feb0e5b521275ce5298725b19833e0c42168 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 31 Dec 2014 07:20:52 -0500 Subject: STORM-2099 Minor formatting issue with logged out message --- indra/newview/skins/default/xui/en/notifications.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ea1bc66236..157cd94939 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2463,8 +2463,9 @@ This is usually a temporary failure. Please customize and save the wearable agai icon="alertmodal.tga" name="YouHaveBeenLoggedOut" type="alertmodal"> -Darn. You have been logged out of [SECOND_LIFE] - [MESSAGE] +Darn. You have been logged out of [SECOND_LIFE]. + +[MESSAGE] Date: Fri, 20 Feb 2015 18:05:41 -0500 Subject: separate tag and attribute names --- indra/newview/skins/default/xui/pl/floater_font_test.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/pl/floater_font_test.xml b/indra/newview/skins/default/xui/pl/floater_font_test.xml index 8542cafd16..7bf6c11d21 100755 --- a/indra/newview/skins/default/xui/pl/floater_font_test.xml +++ b/indra/newview/skins/default/xui/pl/floater_font_test.xml @@ -1,2 +1,2 @@ - + -- cgit v1.2.3 From 79441b908dfc601ace11c438ac080480362c199d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Mar 2015 22:42:12 -0400 Subject: re-enable polish and danish --- .../skins/default/xui/en/panel_preferences_general.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index f6665a1d5d..9da044ab64 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -39,7 +39,12 @@ enabled="true" label="English" name="English" - value="en" /> + value="en" /> + + value="it" /> +