From a2d0b1d77ffdf78ca3dd0a5db276e657a8c4919e Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 21 Oct 2009 00:32:19 +0000
Subject: Side tray uses normal panel colors, not hard-coded floater colors.
 Added "Show Side Tray" to login debug menu. Fixed strange border color around
 Home side tray panel, more similar fixes to follow. Reviewed with Richard.

---
 indra/newview/llsidetray.cpp                                  |  6 ------
 indra/newview/llviewermenu.cpp                                | 11 ++++++++++-
 indra/newview/skins/default/xui/en/menu_login.xml             |  6 ++++++
 .../newview/skins/default/xui/en/panel_sidetray_home_tab.xml  |  3 +--
 4 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 3e53c354d8..15f5e9da7b 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -144,12 +144,6 @@ BOOL LLSideTrayTab::postBuild()
 	
 	title_panel->getChild<LLTextBox>(TAB_PANEL_CAPTION_TITLE_BOX)->setValue(mTabTitle);
 
-	static LLUIColor default_background_color = LLUIColorTable::instance().getColor("FloaterDefaultBackgroundColor");
-	static LLUIColor focus_background_color = LLUIColorTable::instance().getColor("FloaterFocusBackgroundColor");
-	
-	setTransparentColor(default_background_color);
-	setBackgroundColor(focus_background_color);
-	
 	return true;
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a9ba9ead1a..4ee0986046 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3447,6 +3447,15 @@ bool enable_standup_self()
 	return new_value;
 }
 
+// Used from the login screen to aid in UI work on side tray
+void handle_show_side_tray()
+{
+	LLSideTray* side_tray = LLSideTray::getInstance();
+	LLView* root = gViewerWindow->getRootView();
+	// automatically removes and re-adds if there already
+	root->addChild(side_tray);
+}
+
 class LLSelfFriends : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -7931,7 +7940,7 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLAdvancedCheckDebugKeys(), "Advanced.CheckDebugKeys");
 	view_listener_t::addMenu(new LLAdvancedToggleDebugWindowProc(), "Advanced.ToggleDebugWindowProc");
 	view_listener_t::addMenu(new LLAdvancedCheckDebugWindowProc(), "Advanced.CheckDebugWindowProc");
-
+	commit.add("Advanced.ShowSideTray", boost::bind(&handle_show_side_tray));
 
 	// Advanced > XUI
 	commit.add("Advanced.ReloadColorSettings", boost::bind(&LLUIColorTable::loadFromSettings, LLUIColorTable::getInstance()));
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 8cb0a69906..c3ee6e250b 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -222,6 +222,12 @@
          function="ShowFloater"
          parameter="test_inspectors" />
       </menu_item_call>
+      <menu_item_call
+         label="Show Side Tray"
+         name="Show Side Tray">
+        <menu_item_call.on_click
+         function="Advanced.ShowSideTray" />
+      </menu_item_call>
       <menu_item_separator />
         <menu_item_call
          label="Show TOS"
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index e991861e94..247054772e 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Part of side tray, see that XML file for panel config -->
 <panel
- background_visible="true"
- bevel_style="out"
  follows="all"
  height="560"
  label="home_tab"
-- 
cgit v1.2.3