summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-03-27 19:05:23 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-03-27 22:38:15 +0200
commiteaa9b152bfe9b5da44f724ddce1a2ecc86dc61bf (patch)
tree55d78528f5560a5b73dd3a5e87b68a7dc04181f8 /indra/newview
parent9ec2aac56c0e1a60ad8dbf6549b8a3cf7efec570 (diff)
SL-307 Implemented ability to specify color and changed flashing color
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatermodelpreview.cpp5
-rw-r--r--indra/newview/skins/default/xui/en/floater_script_debug.xml3
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index e694340b16..f386e9e305 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1583,7 +1583,10 @@ void LLFloaterModelPreview::addStringToLogTab(const std::string& str, bool flash
if (flash && mTabContainer->getCurrentPanel() != panel)
{
- mTabContainer->setTabPanelFlashing(panel, true);
+ // This will makes colors pale due to "glow_type = LLRender::BT_ALPHA"
+ // So instead of using "MenuItemFlashBgColor" added stronger color
+ static LLUIColor sFlashBgColor(LLColor4U(255, 99, 0));
+ mTabContainer->setTabPanelFlashing(panel, true, sFlashBgColor);
}
}
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml
index cd88048d6b..6c49cfa1a8 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml
@@ -17,5 +17,6 @@
name="Preview Tabs"
tab_position="bottom"
top="16"
- width="448" />
+ width="448"
+ enable_tabs_flashing="true"/>
</multi_floater>