CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and nearby chat

3 files changed, 27 insertions, 4 deletions

diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 430326203f..80051eb7f1 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -136,6 +136,27 @@ BOOL LLFloaterIMNearbyChat::postBuild()
 }
 
 // virtual
+void LLFloaterIMNearbyChat::closeFloater(bool app_quitting)
+{
+	llinfos << "Merov debug : LLFloaterIMNearbyChat::closeFloater! " << llendl;
+	LLFloater::closeFloater(app_quitting);
+}
+
+// virtual
+void LLFloaterIMNearbyChat::closeHostedFloater()
+{
+	if (getHost())
+	{
+		llinfos << "Merov debug : LLFloaterIMNearbyChat::closeHostedFloater : hosted -> do nothing" << llendl;
+	}
+	else
+	{
+		llinfos << "Merov debug : LLFloaterIMNearbyChat::closeHostedFloater : close floater " << llendl;
+		LLFloater::closeFloater();
+	}
+}
+
+// virtual
 void LLFloaterIMNearbyChat::refresh()
 {
 	displaySpeakingIndicator();
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h
index 14c7d01ecd..2d32bb3fc9 100644
--- a/indra/newview/llfloaterimnearbychat.h
+++ b/indra/newview/llfloaterimnearbychat.h
@@ -54,6 +54,8 @@ public:
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/ void setVisible(BOOL visible);
+	/*virtual*/ void closeFloater(bool app_quitting = false);
+	/*virtual*/ void closeHostedFloater();
 
 	void loadHistory();
     void reloadMessages(bool clean_messages = false);
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b50deb7d7a..544f06ac0c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -183,8 +183,7 @@
         </menu_item_call>
          <menu_item_call
          label="Toolbar buttons..."
-         name="Toolbars"
-         shortcut="control|T">
+         name="Toolbars">
             <menu_item_call.on_click
              function="Floater.Toggle"
              parameter="toybox" />
@@ -223,7 +222,8 @@
      tear_off="true">
        <menu_item_check
          label="Conversations..."
-         name="Conversations">
+         name="Conversations"
+         shortcut="control|T">
             <menu_item_check.on_check
              function="Floater.IsOpen"
              parameter="im_container" />
@@ -240,7 +240,7 @@
              function="Floater.Visible"
              parameter="nearby_chat" />
             <menu_item_check.on_click
-             function="Floater.Toggle"
+             function="Floater.ToggleOrBringToFront"
              parameter="nearby_chat" />
         </menu_item_check>
         <menu_item_check