From 6e00f93f8deb66f35259e945efb4d360274b9d1e Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 6 Sep 2018 17:48:20 +0300 Subject: MAINT-9077 FIXED Jellydolled avatar attachments can emit light. --- indra/newview/pipeline.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e541c1054e..e81515d52f 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8666,7 +8666,8 @@ void LLPipeline::renderDeferredLighting() } const LLViewerObject *vobj = drawablep->getVObj(); - if(vobj && vobj->getAvatar() && vobj->getAvatar()->isInMuteList()) + if(vobj && vobj->getAvatar() + && (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList())) { continue; } -- cgit v1.2.3 From 228a25256e7b1a7919d33a8289430282f5fecbb0 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 12 Sep 2018 17:42:23 +0300 Subject: SL-1397 FIXED Check mark doesn't switch when clicking on the label "Mute when minimized" in Preferences --- indra/newview/llfloaterpreference.cpp | 11 +++++++++++ indra/newview/llfloaterpreference.h | 1 + 2 files changed, 12 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 7aff9fb586..f2e7058098 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2329,6 +2329,11 @@ BOOL LLPanelPreference::postBuild() bool show_favorites_at_login = LLPanelLogin::getShowFavorites(); getChild("favorites_on_login_check")->setValue(show_favorites_at_login); } + if (hasChild("mute_chb_label", TRUE)) + { + getChild("mute_chb_label")->setShowCursorHand(false); + getChild("mute_chb_label")->setClickedCallback(boost::bind(&toggleMuteWhenMinimized)); + } //////////////////////PanelAdvanced /////////////////// if (hasChild("modifier_combo", TRUE)) @@ -2438,6 +2443,12 @@ void LLPanelPreference::handleFavoritesOnLoginChanged(LLUICtrl* checkbox, const } } +void LLPanelPreference::toggleMuteWhenMinimized() +{ + std::string mute("MuteWhenMinimized"); + gSavedSettings.setBOOL(mute, !gSavedSettings.getBOOL(mute)); +} + void LLPanelPreference::cancel() { for (control_values_map_t::iterator iter = mSavedValues.begin(); diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 8339a18296..a24b69ddbf 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -244,6 +244,7 @@ private: //for "Show my Favorite Landmarks at Login" static void handleFavoritesOnLoginChanged(LLUICtrl* checkbox, const LLSD& value); + static void toggleMuteWhenMinimized(); typedef std::map string_color_map_t; string_color_map_t mSavedColors; -- cgit v1.2.3 From 78a8cc0976955d22b70b41c1696864323ff2a19e Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 10 Sep 2018 20:56:25 +0300 Subject: MAINT-9116 XUI Cleanup --- indra/newview/llfloaterpreference.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index f2e7058098..c028cb3dee 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -530,13 +530,6 @@ void LLFloaterPreference::onDoNotDisturbResponseChanged() LLFloaterPreference::~LLFloaterPreference() { - // clean up user data - LLComboBox* ctrl_window_size = getChild("windowsize combo"); - for (S32 i = 0; i < ctrl_window_size->getItemCount(); i++) - { - ctrl_window_size->setCurrentByIndex(i); - } - LLConversationLog::instance().removeObserver(this); } -- cgit v1.2.3 From 6395166e43d03b863be81855dbdac775be55a1f6 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 26 Sep 2018 15:51:40 +0300 Subject: =?UTF-8?q?SL-9739=20[Portuguese]=20Reduce=20font=20size=20of=20?= =?UTF-8?q?=E2=80=9CUnable=20to=20buy=E2=80=9D=20text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/skins/default/xui/pt/floater_buy_currency.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml index 2845a29e1d..513400954b 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml @@ -59,7 +59,7 @@