SOCIAL-603 FIX Move how to button to bottom bar

moves scrollbar up from bottom of screen to leave room for resize thumb

5 files changed, 63 insertions, 16 deletions

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 5d5ba03615..4645a2c6e7 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -823,6 +823,12 @@ void LLBottomTray::draw()
 		getChild<LLButton>("show_people_button")->setToggleState(false);
 	}
 
+	LLFloater* help_browser = (LLFloaterReg::findInstance("help_browser"));
+	bool help_floater_visible = (help_browser && help_browser->isInVisibleChain());
+
+	getChild<LLButton>("show_help_btn")->setToggleState(help_floater_visible);
+
+
 }
 
 bool LLBottomTray::onContextMenuItemEnabled(const LLSD& userdata)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 4f7a34e625..38877b7836 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -5647,6 +5647,25 @@ class LLShowHelp : public view_listener_t
 	}
 };
 
+class LLToggleHelp : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLFloater* help_browser = (LLFloaterReg::findInstance("help_browser"));
+		if (help_browser && help_browser->isInVisibleChain())
+		{
+			help_browser->closeFloater();
+		}
+		else
+		{
+			std::string help_topic = userdata.asString();
+			LLViewerHelp* vhelp = LLViewerHelp::getInstance();
+			vhelp->showTopic(help_topic);
+		}
+		return true;
+	}
+};
+
 class LLShowSidetrayPanel : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -8224,6 +8243,7 @@ void initialize_menus()
 	commit.add("ReportAbuse", boost::bind(&handle_report_abuse));
 	commit.add("BuyCurrency", boost::bind(&handle_buy_currency));
 	view_listener_t::addMenu(new LLShowHelp(), "ShowHelp");
+	view_listener_t::addMenu(new LLToggleHelp(), "ToggleHelp");
 	view_listener_t::addMenu(new LLPromptShowURL(), "PromptShowURL");
 	view_listener_t::addMenu(new LLShowAgentProfile(), "ShowAgentProfile");
 	view_listener_t::addMenu(new LLToggleAgentProfile(), "ToggleAgentProfile");
diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index a2c16fc9e2..1cc02006f2 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -131,13 +131,13 @@
                    name="bottom_tray_container"
                    visible="false"/>
             <layout_panel auto_resize="false"
-                          height="200"
+                          height="215"
                           mouse_opaque="false"
                           user_resize="false"
                           name="avatar_picker_and_destination_guide_container"
                           visible="false">
               <panel top="0"
-                     height="200"
+                     height="215"
                      left="0"
                      background_visible="true" 
                      width="500"
diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 2caa8ad903..ccecdd9ece 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -281,7 +281,40 @@
               parameter="agent"/>
           </bottomtray_button>
         </layout_panel>
-        <layout_panel
+      <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="65"
+         mouse_opaque="false"
+         name="howto_panel"
+         top_delta="0"
+         user_resize="false"
+         width="105">
+        <bottomtray_button
+           can_drag="false"
+          follows="left|right"
+          height="23"
+          image_pressed="PushButton_Press"
+          image_pressed_selected="PushButton_Selected_Press"
+          image_selected="PushButton_Selected_Press"
+          label="How To"
+          layout="topleft"
+          left="0"
+          name="show_help_btn"
+          tool_tip="Open Second Life How To topics"
+          is_toggle="true"
+          top="5"
+          use_ellipses="true"
+          width="100">
+          <bottomtray_button.commit_callback
+            function="ToggleHelp"
+            parameter="f1_help" />
+          </bottomtray_button>
+      </layout_panel>
+      <layout_panel
          follows="left|right"
          height="30"
          layout="topleft"
diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index cd21242edc..6dc1a1c9b0 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -63,7 +63,7 @@ width="31" />
      mouse_opaque="false"
      name="location_combo"
      top_delta="0"
-     width="360">
+     width="440">
     </location_input>
     <icon follows="right"
           height="20"
@@ -72,17 +72,5 @@ width="31" />
           image_name="Button_Separator"
           name="separator"
           top="2"/>
-    <button
-      right="-70"
-      top="2"
-      width="80"
-      height="22"
-      label="How To"
-      follows="top|right"
-      name="skylight_help">
-      <commit_callback
-        function="ShowHelp"
-        parameter="f1_help" />
-    </button>
   </panel>
 </panel>