summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2009-11-11 17:05:31 +0200
committerMike Antipov <mantipov@productengine.com>2009-11-11 17:05:31 +0200
commit51d35efa23b7683e078ad95778a365aa383f0bd1 (patch)
tree4f7d10c3211e8158dd3cd2b6c8466372b63ba529
parent454c02102c71e39fc0d844a1ae8bd70873de01a1 (diff)
Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
Code cleaned up: - removed test code to show background in chiclet panel --HG-- branch : product-engine
-rw-r--r--indra/newview/llchiclet.cpp3
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml2
2 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 16ee9a0007..2f43c32187 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -807,9 +807,6 @@ LLChicletPanel::LLChicletPanel(const Params&p)
, mShowControls(true)
{
LLPanel::Params panel_params;
-// *TODO: remove color settings
-panel_params.background_visible(true);
-panel_params.bg_alpha_color(LLColor4::red);
panel_params.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT);
mScrollArea = LLUICtrlFactory::create<LLPanel>(panel_params,this);
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index a945010d3e..6a78834a4c 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -215,8 +215,6 @@
/>
</layout_panel>
<layout_panel
-background_visible="true"
-bg_alpha_color="green"
mouse_opaque="false"
follows="left|right"
height="28"