From 81ef1292edbb0bdd1e3e6fb9eb59c5d9287fd7d1 Mon Sep 17 00:00:00 2001
From: Lirusaito <Inusaito@gmail.com>
Date: Tue, 16 Dec 2014 21:35:28 -0500
Subject: [PATCH] Fix broked World->Chat

---
 indra/newview/llmenucommands.cpp                        | 7 -------
 indra/newview/skins/default/xui/en-us/menu_viewer.xml   | 7 ++++---
 indra/newview/skins/default/xui/en-us/panel_toolbar.xml | 4 +---
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index 393efcc1e..fdd533257 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -116,12 +116,6 @@
 // [/RLVa:LF]
 #include "shfloatermediaticker.h"
 
-void handle_chat()
-{
-	// give focus to chatbar if it's open but not focused
-	static const LLCachedControl<bool> chat_visible("ChatVisible",true);
-	(chat_visible && gFocusMgr.childHasKeyboardFocus(gChatBar)) ? LLChatBar::stopChat() : LLChatBar::startChat(NULL);
-}
 void handle_debug_avatar_textures(void*);
 template<typename T> void handle_singleton_toggle(void*);
 void show_outfit_dialog() { new LLMakeOutfitDialog(false); }
@@ -177,7 +171,6 @@ struct MenuFloaterDict : public LLSingleton<MenuFloaterDict>
 		registerFloater("build", boost::bind(toggle_build));
 		registerFloater("buy currency", boost::bind(LLFloaterBuyCurrency::buyCurrency));
 		registerFloater("buy land", boost::bind(&LLViewerParcelMgr::startBuyLand, boost::bind(LLViewerParcelMgr::getInstance), false));
-		registerFloater("chatbar", boost::bind(handle_chat));
 		registerFloater("complaint reporter", boost::bind(LLFloaterReporter::showFromMenu, COMPLAINT_REPORT));
 		registerFloater("DayCycle", boost::bind(LLFloaterDayCycle::show), boost::bind(LLFloaterDayCycle::isOpen));
 		registerFloater("debug avatar", boost::bind(handle_debug_avatar_textures, (void*)NULL));
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index d2d6765bd..9dee8d13f 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -491,10 +491,11 @@
 	<menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
 	     height="339" label="World" left="0" mouse_opaque="false" name="World"
 	     opaque="true" tear_off="true" width="185">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Chat" left="0"
+		<menu_item_check bottom="-29" enabled="true" height="19" label="Chat" left="0"
 		     mouse_opaque="true" name="Chat" shortcut="" width="185">
-			<on_click function="FloaterShow" userdata="chatbar" />
-		</menu_item_call>
+			<on_click function="ToggleControl" userdata="ChatVisible"/>
+			<on_check control="ChatVisible"/>
+		</menu_item_check>
 		<menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
 		     mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
 			<on_click function="ShowFloater" userdata="always run" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index 1a04e5d73..d77945f32 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -9,9 +9,7 @@
       <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0" left="0" />
     </layout_panel>
     <layout_panel name="panel2" height="24" width="50" auto_resize="false" user_resize="false" visibility_control="ToolbarVisibleChatbar">
-      <button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" control_name="ChatVisible">
-        <button.commit_callback function="ShowFloater" parameter="chatbar"/>
-      </button>
+      <button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" control_name="ChatVisible" toggle="true"/>
     </layout_panel>
     <layout_panel name="panel3" height="2" width="2" auto_resize="false" user_resize="false" visibility_control="ToolbarVisibleChatbar">
       <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0"/>