From f5323715de8a47f87acdc287a9167ac1e9dea645 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 21 Jul 2016 09:05:44 +0200 Subject: [PATCH 01/36] FIRE-19684: Crash when using untabbed IM windows; calling LLTransientDockableFloater::setDocked() from the ctor will try to update messages before floater is built --- indra/newview/fsfloaterim.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp index a641ee626e..7e78c1dea4 100644 --- a/indra/newview/fsfloaterim.cpp +++ b/indra/newview/fsfloaterim.cpp @@ -2359,6 +2359,9 @@ void FSFloaterIM::handleMinimized(bool minimized) else { gConsole->addSession(mSessionID); - updateMessages(); + if (mChatHistory) + { + updateMessages(); + } } } From d1b24736876a1d82bd53db3bd2d66a7491023314 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Thu, 21 Jul 2016 14:37:08 +0200 Subject: [PATCH 02/36] [FIXED] Using reverse logic isn't always a terribly good idea --HG-- branch : RLVa --- indra/newview/llavataractions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index fc5809827f..be5709e957 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -465,7 +465,7 @@ void LLAvatarActions::teleport_request_callback(const LLSD& notification, const std::string strMessage = response["message"]; // Filter the request message if the recipients is IM-blocked - if ( (!RlvActions::isRlvEnabled()) || ((RlvActions::canStartIM(idRecipient)) && (RlvActions::canSendIM(idRecipient))) ) + if ( (RlvActions::isRlvEnabled()) && ((!RlvActions::canStartIM(idRecipient)) || (!RlvActions::canSendIM(idRecipient))) ) { strMessage = RlvStrings::getString(RLV_STRING_HIDDEN); } From 613fa77cfa4141a8275b7ba9664a2dd2483c008b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 21 Jul 2016 15:16:25 +0200 Subject: [PATCH 03/36] Silence debug messages from FSData --- indra/newview/app_settings/logcontrol.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 62ef3bb2f1..7368dc8021 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -60,7 +60,6 @@ --> import export - fsdata SLURL Outfit From cd37baf22b4df6b13f87deea8441ba1095f903f3 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 21 Jul 2016 16:04:49 +0200 Subject: [PATCH 04/36] Fix pressing # in web search trying to start a gesture --- indra/newview/llviewerkeyboard.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index b591378c78..68759effc6 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -50,6 +50,7 @@ #include "rlvhandler.h" // [/RLVa:KB] #include "llfloaterwebcontent.h" +#include "fsfloatersearch.h" // // Constants @@ -631,7 +632,7 @@ void start_gesture( EKeystate s ) // FIRE-4167: Don't start gesture if a floater with web content has focus LLFloater* focused_floater = gFloaterView->getFocusedFloater(); - if (focused_floater && dynamic_cast(focused_floater)) + if (focused_floater && (dynamic_cast(focused_floater) || dynamic_cast(focused_floater))) { return; } From 688439cd2a986b60b536ee1382098fde6c161f9a Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Thu, 21 Jul 2016 18:11:08 +0200 Subject: [PATCH 05/36] BUG-20161: Detached object ends up in root of inventory --- indra/newview/llinventorymodel.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 1f1a255310..905737f445 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1025,8 +1025,11 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) item_array_t* item_array = get_ptr_in_map(mParentChildItemTree, category_id); if( item_array ) { + LLInventoryModel::LLCategoryUpdate update(category_id, 1); + gInventory.accountForUpdate(update); + // *FIX: bit of a hack to call update server from here... - new_item->updateServer(TRUE); + new_item->updateParentOnServer(FALSE); item_array->push_back(new_item); } else @@ -1067,9 +1070,12 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) item_array = get_ptr_in_map(mParentChildItemTree, parent_id); if(item_array) { + LLInventoryModel::LLCategoryUpdate update(parent_id, 1); + gInventory.accountForUpdate(update); + // *FIX: bit of a hack to call update server from // here... - new_item->updateServer(TRUE); + new_item->updateParentOnServer(FALSE); item_array->push_back(new_item); } else From 833ee7b7eaaa6611e4dd131a2058459b661350e2 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 21 Jul 2016 19:36:11 +0200 Subject: [PATCH 06/36] Tag Firestorm changes --- indra/newview/llinventorymodel.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 905737f445..b23a718130 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1025,11 +1025,13 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) item_array_t* item_array = get_ptr_in_map(mParentChildItemTree, category_id); if( item_array ) { + // *FIX: bit of a hack to call update server from here... + // FIRE-19635 / BUG-20161: Detached object ends up in root of inventory + //new_item->updateServer(TRUE); LLInventoryModel::LLCategoryUpdate update(category_id, 1); gInventory.accountForUpdate(update); - - // *FIX: bit of a hack to call update server from here... new_item->updateParentOnServer(FALSE); + // item_array->push_back(new_item); } else @@ -1070,12 +1072,14 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) item_array = get_ptr_in_map(mParentChildItemTree, parent_id); if(item_array) { - LLInventoryModel::LLCategoryUpdate update(parent_id, 1); - gInventory.accountForUpdate(update); - // *FIX: bit of a hack to call update server from // here... + // FIRE-19635 / BUG-20161: Detached object ends up in root of inventory + //new_item->updateServer(TRUE); + LLInventoryModel::LLCategoryUpdate update(parent_id, 1); + gInventory.accountForUpdate(update); new_item->updateParentOnServer(FALSE); + // item_array->push_back(new_item); } else From 741f59c0c77e2e2d7a06c2b1e71581bf9f661da8 Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Thu, 21 Jul 2016 21:39:00 -0700 Subject: [PATCH 07/36] Fixed spelling on FSFlashOnMessage description --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 334faa329a..bc808a1c3b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -22643,7 +22643,7 @@ Change of this parameter will affect the layout of buttons in notification toast FSFlashOnMessage Comment - Flash/Bounce the app icon when a new message is recieved and Firestorm is not in focus + Flash/Bounce the app icon when a new message is received and Firestorm is not in focus Persist 1 Type From 9b152a4bd9328a1ce8aed936d12a3150ab97933f Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Thu, 21 Jul 2016 23:01:18 -0700 Subject: [PATCH 08/36] FIRE-19696: Add option to disable app icon flash/bounce on object IM --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llviewermessage.cpp | 5 ++++- .../skins/default/xui/en/panel_preferences_alerts.xml | 10 ++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index bc808a1c3b..38bf2a2fa7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -22651,6 +22651,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 + FSFlashOnObjectIM + + Comment + Flash/Bounce the app icon when a new instant message from an object is received and Firestorm is not in focus. + Persist + 1 + Type + Boolean + Value + 1 + FSDisableReturnObjectNotification Comment diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 51c14072ee..09e0244dc2 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4209,7 +4209,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // Make osx dashboard icon bounce when window isn't in focus //if (viewer_window && viewer_window->getMinimized()) static LLCachedControl sFlashIcon(gSavedSettings, "FSFlashOnMessage"); - if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon) + // FIRE-19696: Add option to disable app icon flash/bounce on object IM + static LLCachedControl sFSFlashOnObjectIM(gSavedSettings, "FSFlashOnObjectIM"); + // if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon) + if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon && (sFSFlashOnObjectIM || (chat.mChatType != CHAT_TYPE_IM))) { viewer_window->flashIcon(5.f); } diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml index 4e211f9127..c06bb356f1 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml @@ -119,11 +119,21 @@ name="FSFlashOnMessage" top="10" width="450"/> + From 68e034f72b1e01712aa3df363921b31ef3d124f8 Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Thu, 21 Jul 2016 23:32:38 -0700 Subject: [PATCH 09/36] FIRE-11920: Always enable replace outfit from inventory --- indra/newview/llappearancemgr.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 870516143d..72482cbe66 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1982,17 +1982,20 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id) return false; } +// FIRE-11920: Always allow replacing outfit // Check whether the outfit contains any wearables we aren't wearing already (STORM-702). - LLInventoryModel::cat_array_t cats; - LLInventoryModel::item_array_t items; - LLFindWearablesEx is_worn(/*is_worn=*/ false, /*include_body_parts=*/ true); - gInventory.collectDescendentsIf(outfit_cat_id, - cats, - items, - LLInventoryModel::EXCLUDE_TRASH, - is_worn); +// LLInventoryModel::cat_array_t cats; +// LLInventoryModel::item_array_t items; +// LLFindWearablesEx is_worn(/*is_worn=*/ false, /*include_body_parts=*/ true); +// gInventory.collectDescendentsIf(outfit_cat_id, +// cats, +// items, +// LLInventoryModel::EXCLUDE_TRASH, +// is_worn); - return items.size() > 0; +// return items.size() > 0; + return TRUE; +// FIRE-11920: Always allow replacing outfit } // Moved from LLWearableList::ContextMenu for wider utility. From 16534ec8abaf005b31745d85dc4033e0955ff700 Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Thu, 21 Jul 2016 23:50:25 -0700 Subject: [PATCH 10/36] FIRE-19697: Add setting to disable quick graphics preset menu popup on mouse over --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llstatusbar.cpp | 8 +++++++- .../skins/default/xui/en/panel_preferences_UI.xml | 8 ++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 38bf2a2fa7..66dabd3d50 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -24053,6 +24053,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 + FSGraphicsPresetMenuButtonPopupOnRollover + + Comment + Enable rollover popup on quick graphics menu icon (Restart Required) + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 517b7a62c2..4442a43360 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -285,7 +285,13 @@ BOOL LLStatusBar::postBuild() //mBtnStats = getChildView("stat_btn"); mIconPresets = getChild( "presets_icon" ); - mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); + // FIRE-19697: Add setting to disable graphics preset menu popup on mouse over + // mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); + if (gSavedSettings.getBOOL("FSGraphicsPresetMenuButtonPopupOnRollover")) + { + mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); + } + // FIRE-19697: Add setting to disable graphics preset menu popup on mouse over mIconPresets->setClickedCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); mBtnVolume = getChild( "volume_btn" ); diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml index dcfdee66aa..2835697af0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml @@ -626,6 +626,14 @@ name="FSShowCurrencyBalanceInStatusbar" width="270" control_name="FSShowCurrencyBalanceInStatusbar"/> + Date: Fri, 22 Jul 2016 00:22:03 -0700 Subject: [PATCH 11/36] FIRE-19697: Add setting to disable status bar icon menu popup on mouseover --- indra/newview/app_settings/settings.xml | 4 ++-- indra/newview/llstatusbar.cpp | 19 ++++++++++++++++--- .../default/xui/en/panel_preferences_UI.xml | 6 +++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 66dabd3d50..a17802bfd1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -24053,10 +24053,10 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 - FSGraphicsPresetMenuButtonPopupOnRollover + FSStatusBarMenuButtonPopupOnRollover Comment - Enable rollover popup on quick graphics menu icon (Restart Required) + Enable rollover popups on top status bar menu icons: Quick Graphics Presets, Volume, and Media. (Restart Required) Persist 1 Type diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 4442a43360..ec0f029215 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -287,7 +287,7 @@ BOOL LLStatusBar::postBuild() mIconPresets = getChild( "presets_icon" ); // FIRE-19697: Add setting to disable graphics preset menu popup on mouse over // mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); - if (gSavedSettings.getBOOL("FSGraphicsPresetMenuButtonPopupOnRollover")) + if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover")) { mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); } @@ -296,7 +296,13 @@ BOOL LLStatusBar::postBuild() mBtnVolume = getChild( "volume_btn" ); mBtnVolume->setClickedCallback( onClickVolume, this ); - mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); + // FIRE-19697: Add setting to disable status bar icon menu popup on mouseover + // mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); + if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover")) + { + mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); + } + // FIRE-19697: Add setting to disable status bar icon menu popup on mouseover // ## Zi: Media/Stream separation mStreamToggle = getChild("stream_toggle_btn"); @@ -305,7 +311,14 @@ BOOL LLStatusBar::postBuild() mMediaToggle = getChild("media_toggle_btn"); mMediaToggle->setClickedCallback( &LLStatusBar::onClickMediaToggle, this ); - mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); + // FIRE-19697: Add setting to disable status bar icon menu popup on mouseover + if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover")) + // mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); + + { + mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); + } + // FIRE-19697: Add setting to disable status bar icon menu popup on mouseover LLHints::registerHintTarget("linden_balance", getChild("balance_bg")->getHandle()); diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml index 2835697af0..77c9a835c0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml @@ -630,10 +630,10 @@ top_pad="4" follows="left|top" height="16" - label="Enable rollover popup on quick graphics menu icon (Restart Required)" - name="FSGraphicsPresetMenuButtonPopupOnRollover" + label="Enable mouse rollover popup on status bar menu icons (Restart Required)" + name="FSStatusBarMenuButtonPopupOnRollover" width="270" - control_name="FSGraphicsPresetMenuButtonPopupOnRollover"/> + control_name="FSStatusBarMenuButtonPopupOnRollover"/> Date: Fri, 22 Jul 2016 09:25:58 +0200 Subject: [PATCH 12/36] Cleanup --- indra/newview/llviewermessage.cpp | 2 -- .../newview/skins/default/xui/en/panel_preferences_alerts.xml | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 09e0244dc2..55d7333af0 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4209,9 +4209,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // Make osx dashboard icon bounce when window isn't in focus //if (viewer_window && viewer_window->getMinimized()) static LLCachedControl sFlashIcon(gSavedSettings, "FSFlashOnMessage"); - // FIRE-19696: Add option to disable app icon flash/bounce on object IM static LLCachedControl sFSFlashOnObjectIM(gSavedSettings, "FSFlashOnObjectIM"); - // if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon) if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon && (sFSFlashOnObjectIM || (chat.mChatType != CHAT_TYPE_IM))) { viewer_window->flashIcon(5.f); diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml index c06bb356f1..b1fe508b18 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml @@ -121,8 +121,9 @@ width="450"/> Date: Fri, 22 Jul 2016 09:51:43 +0200 Subject: [PATCH 13/36] FIRE-19697: Made toggle of FSStatusBarMenuButtonPopupOnRollover instant without restart --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llstatusbar.cpp | 69 ++++++++++++++++--- indra/newview/llstatusbar.h | 10 +++ .../default/xui/en/panel_preferences_UI.xml | 2 +- 4 files changed, 72 insertions(+), 11 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a17802bfd1..643243ca32 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -24056,7 +24056,7 @@ Change of this parameter will affect the layout of buttons in notification toast FSStatusBarMenuButtonPopupOnRollover Comment - Enable rollover popups on top status bar menu icons: Quick Graphics Presets, Volume, and Media. (Restart Required) + Enable rollover popups on top status bar menu icons: Quick Graphics Presets, Volume, and Media. Persist 1 Type diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index ec0f029215..68ea169ea9 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -195,7 +195,12 @@ LLStatusBar::LLStatusBar(const LLRect& rect) mNearbyIcons(FALSE), // Script debug mSearchData(NULL), // Hook up and init for filtering mFilterEdit(NULL), // Edit for filtering - mSearchPanel(NULL) // Panel for filtering + mSearchPanel(NULL), // Panel for filtering + mIconPresets(NULL), + mMediaToggle(NULL), + mMouseEnterPresetsConnection(), + mMouseEnterVolumeConnection(), + mMouseEnterNearbyMediaConnection() { setRect(rect); @@ -244,6 +249,22 @@ LLStatusBar::~LLStatusBar() { mShowCoordsCtrlConnection.disconnect(); } + + // FIRE-19697: Add setting to disable graphics preset menu popup on mouse over + if (mMouseEnterPresetsConnection.connected()) + { + mMouseEnterPresetsConnection.disconnect(); + } + if (mMouseEnterVolumeConnection.connected()) + { + mMouseEnterVolumeConnection.disconnect(); + } + if (mMouseEnterNearbyMediaConnection.connected()) + { + mMouseEnterNearbyMediaConnection.disconnect(); + } + // + // LLView destructor cleans up children } @@ -289,7 +310,7 @@ BOOL LLStatusBar::postBuild() // mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover")) { - mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); + mMouseEnterPresetsConnection = mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); } // FIRE-19697: Add setting to disable graphics preset menu popup on mouse over mIconPresets->setClickedCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); @@ -300,23 +321,22 @@ BOOL LLStatusBar::postBuild() // mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover")) { - mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); + mMouseEnterVolumeConnection = mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); } // FIRE-19697: Add setting to disable status bar icon menu popup on mouseover - // ## Zi: Media/Stream separation + // Media/Stream separation mStreamToggle = getChild("stream_toggle_btn"); - mStreamToggle->setClickedCallback( &LLStatusBar::onClickStreamToggle, this ); - // ## Zi: Media/Stream separation + mStreamToggle->setClickedCallback(&LLStatusBar::onClickStreamToggle, this); + // Media/Stream separation mMediaToggle = getChild("media_toggle_btn"); mMediaToggle->setClickedCallback( &LLStatusBar::onClickMediaToggle, this ); // FIRE-19697: Add setting to disable status bar icon menu popup on mouseover + // mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover")) - // mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); - { - mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); + mMouseEnterNearbyMediaConnection = mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); } // FIRE-19697: Add setting to disable status bar icon menu popup on mouseover @@ -324,6 +344,9 @@ BOOL LLStatusBar::postBuild() gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2)); + // FIRE-19697: Add setting to disable graphics preset menu popup on mouse over + gSavedSettings.getControl("FSStatusBarMenuButtonPopupOnRollover")->getSignal()->connect(boost::bind(&LLStatusBar::onPopupRolloverChanged, this, _2)); + // Adding Net Stat Graph S32 x = getRect().getWidth() - 2; S32 y = 0; @@ -1601,3 +1624,31 @@ void LLStatusBar::updateMenuSearchVisibility(const LLSD& data) } update(); } + +// FIRE-19697: Add setting to disable graphics preset menu popup on mouse over +void LLStatusBar::onPopupRolloverChanged(const LLSD& newvalue) +{ + bool new_value = newvalue.asBoolean(); + + if (new_value) + { + mMouseEnterPresetsConnection = mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); + mMouseEnterVolumeConnection = mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); + mMouseEnterNearbyMediaConnection = mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); + } + else + { + if (mMouseEnterPresetsConnection.connected()) + { + mMouseEnterPresetsConnection.disconnect(); + } + if (mMouseEnterVolumeConnection.connected()) + { + mMouseEnterVolumeConnection.disconnect(); + } + if (mMouseEnterNearbyMediaConnection.connected()) + { + mMouseEnterNearbyMediaConnection.disconnect(); + } + } +} diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index 730706bb8b..8a819b914f 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -261,6 +261,10 @@ private: void onNavMeshStatusChange(const LLPathfindingNavMeshStatus &pNavMeshStatus); void createNavMeshStatusListenerForCurrentRegion(); // Pathfinding support + + // FIRE-19697: Add setting to disable graphics preset menu popup on mouse over + void onPopupRolloverChanged(const LLSD& newvalue); + public: /** @@ -362,6 +366,12 @@ private: boost::signals2::connection mShowCoordsCtrlConnection; boost::signals2::connection mParcelMgrConnection; + // FIRE-19697: Add setting to disable graphics preset menu popup on mouse over + boost::signals2::connection mMouseEnterPresetsConnection; + boost::signals2::connection mMouseEnterVolumeConnection; + boost::signals2::connection mMouseEnterNearbyMediaConnection; + // + // Pathfinding rebake functions BOOL rebakeRegionCallback(const LLSD& notification,const LLSD& response); diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml index 77c9a835c0..d4ad3e6ee4 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml @@ -630,7 +630,7 @@ top_pad="4" follows="left|top" height="16" - label="Enable mouse rollover popup on status bar menu icons (Restart Required)" + label="Enable mouse rollover popup on status bar menu icons" name="FSStatusBarMenuButtonPopupOnRollover" width="270" control_name="FSStatusBarMenuButtonPopupOnRollover"/> From 85f155c342fe206fdab3aa8d86e0ca85fae20cb7 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 22 Jul 2016 09:51:54 +0200 Subject: [PATCH 14/36] Update German translation --- .../default/xui/de/panel_preferences_UI.xml | 1 + .../xui/de/panel_preferences_alerts.xml | 117 +++++++++--------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml index 2a9e73f82c..5656244038 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml @@ -90,6 +90,7 @@ + Navigations- und Favoriten-Leiste: diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml index 9f8e0f5bc9..86186824e3 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml @@ -1,66 +1,65 @@ - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - Anzeigen, wenn meine Freunden sich an- oder abmelden: - - - - - + + + + + + + Anzeigen, wenn meine Freunden sich an- oder abmelden: + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - Immer anzeigen: - - - Niemals anzeigen: - - - - + + + + Immer anzeigen: + + + Niemals anzeigen: + + + From 99118e5eb936c85942d1e27325c4cca469506361 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 22 Jul 2016 09:55:04 +0200 Subject: [PATCH 15/36] Make this a bit smarter and always disconnect callbacks --- indra/newview/llstatusbar.cpp | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 68ea169ea9..d3699b3984 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -1630,25 +1630,23 @@ void LLStatusBar::onPopupRolloverChanged(const LLSD& newvalue) { bool new_value = newvalue.asBoolean(); + if (mMouseEnterPresetsConnection.connected()) + { + mMouseEnterPresetsConnection.disconnect(); + } + if (mMouseEnterVolumeConnection.connected()) + { + mMouseEnterVolumeConnection.disconnect(); + } + if (mMouseEnterNearbyMediaConnection.connected()) + { + mMouseEnterNearbyMediaConnection.disconnect(); + } + if (new_value) { mMouseEnterPresetsConnection = mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this)); mMouseEnterVolumeConnection = mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); mMouseEnterNearbyMediaConnection = mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); } - else - { - if (mMouseEnterPresetsConnection.connected()) - { - mMouseEnterPresetsConnection.disconnect(); - } - if (mMouseEnterVolumeConnection.connected()) - { - mMouseEnterVolumeConnection.disconnect(); - } - if (mMouseEnterNearbyMediaConnection.connected()) - { - mMouseEnterNearbyMediaConnection.disconnect(); - } - } } From bcddde997ec7cfe1531d212238d481e2f79bb855 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 22 Jul 2016 10:04:11 +0200 Subject: [PATCH 16/36] Properly enable/disable FSFilterGrowlKeywordDuplicateIMs growl option in preferences --- indra/newview/llfloaterpreference.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index ce96a1092d..df28c17beb 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -3621,9 +3621,11 @@ BOOL LLPanelPreference::postBuild() // Only enable Growl checkboxes if Growl is usable if (hasChild("notify_growl_checkbox", TRUE)) { + BOOL growl_enabled = gSavedSettings.getBOOL("FSEnableGrowl") && GrowlManager::isUsable(); getChild("notify_growl_checkbox")->setCommitCallback(boost::bind(&LLPanelPreference::onEnableGrowlChanged, this)); getChild("notify_growl_checkbox")->setEnabled(GrowlManager::isUsable()); - getChild("notify_growl_always_checkbox")->setEnabled(gSavedSettings.getBOOL("FSEnableGrowl") && GrowlManager::isUsable()); + getChild("notify_growl_always_checkbox")->setEnabled(growl_enabled); + getChild("FSFilterGrowlKeywordDuplicateIMs")->setEnabled(growl_enabled); } // @@ -3727,7 +3729,9 @@ void LLPanelPreference::handleFavoritesOnLoginChanged(LLUICtrl* checkbox, const // Only enable Growl checkboxes if Growl is usable void LLPanelPreference::onEnableGrowlChanged() { - getChild("notify_growl_always_checkbox")->setEnabled(gSavedSettings.getBOOL("FSEnableGrowl") && GrowlManager::isUsable()); + BOOL growl_enabled = gSavedSettings.getBOOL("FSEnableGrowl") && GrowlManager::isUsable(); + getChild("notify_growl_always_checkbox")->setEnabled(growl_enabled); + getChild("FSFilterGrowlKeywordDuplicateIMs")->setEnabled(growl_enabled); } // From 2792c9fa54ed4e0c9bac5c3d1934e22846272f7e Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 22 Jul 2016 13:30:24 +0200 Subject: [PATCH 17/36] Tip to default. --- README_BUILD_FIRESTORM_LINUX.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt index 18e7aef3ee..c6ea26031b 100755 --- a/README_BUILD_FIRESTORM_LINUX.txt +++ b/README_BUILD_FIRESTORM_LINUX.txt @@ -1,4 +1,4 @@ -First, make sure gcc-4.6 and g++-4.6 are installed. +First, make sure gcc-4.7 and g++-4.7 are installed. 32bit build platforms are better tested at this point and strongly recommended. From 2aef0878ce9cbcd97199218946aa2a0a9dfb2f4b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 22 Jul 2016 13:46:15 +0200 Subject: [PATCH 18/36] Remove unused variable --- indra/newview/llstatusbar.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index d3699b3984..1053552cba 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -1415,7 +1415,7 @@ void LLStatusBar::onParcelIconClick(EParcelIcon icon) case PATHFINDING_DIRTY_ICON: // Pathfinding rebake functions // LLNotificationsUtil::add("PathfindingDirty"); - LLNotificationsUtil::add("PathfindingDirty",LLSD(),LLSD(),boost::bind(&LLStatusBar::rebakeRegionCallback,this,_1,_2)); + LLNotificationsUtil::add("PathfindingDirty", LLSD(), LLSD(), boost::bind(&LLStatusBar::rebakeRegionCallback, this, _1, _2)); // break; case PATHFINDING_DISABLED_ICON: @@ -1542,10 +1542,9 @@ void LLStatusBar::updateVolumeControlsVisibility(const LLSD& data) // // Pathfinding rebake functions -BOOL LLStatusBar::rebakeRegionCallback(const LLSD& notification,const LLSD& response) +BOOL LLStatusBar::rebakeRegionCallback(const LLSD& notification, const LLSD& response) { - std::string newSetName = response["message"].asString(); - S32 option = LLNotificationsUtil::getSelectedOption(notification,response); + S32 option = LLNotificationsUtil::getSelectedOption(notification, response); if (option == 0) { From e7e60dba4f5e2edc19e82a460608a4e6c21c46ca Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Fri, 22 Jul 2016 20:26:33 +0200 Subject: [PATCH 19/36] Updated Polish translation --- indra/newview/skins/default/xui/pl/panel_preferences_UI.xml | 1 + indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml index 033c482582..dd7ae32df5 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml @@ -84,6 +84,7 @@ + Paski nawigacji i ulubionych: diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml index 7c3f2e0fab..2f6a0ee227 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml @@ -12,6 +12,7 @@ + From 25b3559787ac2ec8519ae1da01a99ae816dbbfe8 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 22 Jul 2016 20:32:29 +0200 Subject: [PATCH 20/36] FIRE-19700: Adjustments to AnsaStorm Blood theme by Paladin Forzane --- indra/newview/skins/ansastorm/themes/blood/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/ansastorm/themes/blood/colors.xml b/indra/newview/skins/ansastorm/themes/blood/colors.xml index a301896073..dbb6facb7f 100644 --- a/indra/newview/skins/ansastorm/themes/blood/colors.xml +++ b/indra/newview/skins/ansastorm/themes/blood/colors.xml @@ -327,7 +327,7 @@ value="0.04 0.04 0.04 1.0" /> + value="0.2 0 0 0.5" /> From 40b742a0c178b109792545928053b304b639496c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 23 Jul 2016 13:04:19 +0200 Subject: [PATCH 21/36] FIRE-19614: Make CTRL-O toggle the appearance floater --- indra/newview/llviewermenu.cpp | 7 +++++++ indra/newview/skins/default/xui/da/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/de/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/en/menu_viewer.xml | 11 +++++++---- indra/newview/skins/default/xui/es/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/fr/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/it/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/ja/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/pl/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/pt/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/ru/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/tr/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/zh/menu_viewer.xml | 2 +- 13 files changed, 25 insertions(+), 15 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 1180e5257d..a54e0abdc4 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7508,6 +7508,13 @@ void handle_viewer_disable_message_log(void*) void handle_customize_avatar() { + // FIRE-19614: Make CTRL-O toggle the appearance floater + if (LLFloaterReg::instanceVisible("appearance")) + { + LLFloaterReg::hideInstance("appearance"); + } + else + // LLFloaterSidePanelContainer::showPanel("appearance", LLSD().with("type", "my_outfits")); } diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index b309ea0be3..9cd1b6d912 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -5,7 +5,7 @@ - + diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index d3cbc5aec0..396924de0d 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -11,7 +11,7 @@ - + diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 898799bd10..bc0c4743c2 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -90,15 +90,18 @@ parameter="agent" /> - - - + - + - + diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index ef38376991..bd51ca7215 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -9,7 +9,7 @@ - + diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index cafbc32795..adc325793f 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -8,7 +8,7 @@ - + diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index 93f919b44d..c5e0b09c93 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -16,7 +16,7 @@ - + diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index 3be83d4c2e..2167b48af7 100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -9,7 +9,7 @@ - + diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index abdb40d23f..e01af3b821 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -7,7 +7,7 @@ - + diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index 524a4193d7..1e60f476d5 100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -8,7 +8,7 @@ - + diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index 70c1775a20..16519c7100 100644 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -2,7 +2,7 @@ - + diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index 67bfce8e27..13388d9f32 100644 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -2,7 +2,7 @@ - + From bcf70aad1b25d1ad44e3d49cb17e89f29f3130b0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 23 Jul 2016 13:52:06 +0200 Subject: [PATCH 22/36] RLV fix: could zoom at people via IM chat history context menu under @shownames restrictions --- indra/newview/fscommon.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/fscommon.cpp b/indra/newview/fscommon.cpp index b29b8590a2..2df3b036a6 100644 --- a/indra/newview/fscommon.cpp +++ b/indra/newview/fscommon.cpp @@ -325,7 +325,7 @@ bool FSCommon::checkIsActionEnabled(const LLUUID& av_id, EFSRegistrarFunctionAct } else if (action == FS_RGSTR_ACT_ZOOM_IN) { - return (!isSelf && LLAvatarActions::canZoomIn(av_id)); + return (!isSelf && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) && LLAvatarActions::canZoomIn(av_id)); } else if (action == FS_RGSTR_ACT_OFFER_TELEPORT) { From 328ca571219f504fc54d7ab3f928191f60ebb69d Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sun, 24 Jul 2016 02:26:14 +0200 Subject: [PATCH 23/36] [FIXED] HUD textures no longer update when @setcam_textures[:] is active --HG-- branch : RLVa --- indra/newview/llface.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 85d5a30e1e..b4c1fc96c5 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -293,7 +293,8 @@ void LLFace::setTexture(U32 ch, LLViewerTexture* tex) if ( (LLRender::DIFFUSE_MAP == ch) && (!mShowDiffTexture) ) { mOrigDiffTexture = tex; - return; + if (LLViewerFetchedTexture::sDefaultDiffuseImagep.get() == mTexture[ch].get()) + return; } // [/SL:KB] From a6e8f06052e750143a0c72791bf6d90926ecfacc Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 24 Jul 2016 10:22:43 +0200 Subject: [PATCH 24/36] FIRE-19707: Japanese translation update by Hiroshi Kumaki --- .../default/xui/ja/panel_fs_nui_login.xml | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml diff --git a/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml new file mode 100644 index 0000000000..776761740f --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml @@ -0,0 +1,72 @@ + + + + http://secondlife.com/account/request.php?lang=ja + + + + + + + + + + + + + + @@ -358,7 +358,7 @@ - + @@ -515,8 +515,6 @@ - - diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 0f808ed415..391d77cea0 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -1415,6 +1415,15 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく + +ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。 +[OVERLIMIT_MSG] + + + + +ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。 + [APP_NAME] のインストールが完了しました。 @@ -1779,14 +1788,7 @@ http://secondlife.com/download から最新バージョンをダウンロード グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。 - - グループを抜けることができません: [reason]。 - - - - グループ [group_name] を抜けました。 - - + 本当に住人全員をグリッドから追い出しますか？ @@ -2492,6 +2494,12 @@ Linden Lab ごみ箱の中身をすべて削除しますか？ + + +ゴミ箱が一杯です。ログイン時に問題が起こる可能性があります。 + + + トラベル、Web、検索の履歴をすべて削除しますか？ @@ -3502,6 +3510,15 @@ M キーを押して変更します。 容姿のXMLファイルへの保存が失敗しました + + +事前設定 [NAME] の保存時にエラーが発生しました。 + + + +事前設定 [NAME] の削除時にエラーが発生しました。 + + ヘルプトピックが見つかりませんでした。 diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml b/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml index a663d4ba83..be41e9927b 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml @@ -72,6 +72,8 @@ + + （再起動が必要） @@ -103,6 +105,7 @@ + ナビゲーション＆お気に入りバー： diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml index 1653e737fe..65b72ccbe2 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml @@ -23,6 +23,7 @@ + diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_backup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_backup.xml index 519ee56ea5..7f032247ef 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_backup.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_backup.xml @@ -88,6 +88,12 @@ 抑止したグループチャット + + 事前設定 + + + アバター表示設定 + diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml index ec24f62eb9..cfd8fcd588 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml @@ -101,6 +101,8 @@ （アバターの視線に関する設定は「プライバシー」タブにあります。） + + @@ -271,6 +273,8 @@ + + diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index d2a8ec5ae3..7379b5e451 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -63,9 +63,9 @@ - + + + diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml index 000c3d273a..2d15e30260 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml @@ -6,7 +6,14 @@ - + + 使用中の事前設定: + + + + （なし） + + クォリティとスピード: @@ -82,7 +89,14 @@ m - + + + 0 + + + + 0 + 低 @@ -103,7 +117,6 @@ アバターレンダリング： - @@ -114,6 +127,13 @@ + + 事前設定: + +