merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 4 insertions, 43 deletions

diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index ac77a920a5..80bc2ad861 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -35,6 +35,7 @@
 #include "llmenucommands.h"
 
 #include "imageids.h"
+#include "llfloaterreg.h"
 #include "llfontgl.h"
 #include "llrect.h"
 #include "llerror.h"
@@ -48,7 +49,6 @@
 #include "llfirstuse.h"
 #include "llfloaterchat.h"
 #include "llfloaterdirectory.h"
-#include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llgivemoney.h"
 #include "llinventoryview.h"
@@ -67,14 +67,7 @@
 #include "llworld.h"
 #include "llworldmap.h"
 #include "llfocusmgr.h"
-
-void handle_track_avatar(const LLUUID& agent_id, const std::string& name)
-{	
-	LLAvatarTracker::instance().track(agent_id, name);
-
-	LLFloaterDirectory::hide(NULL);
-	LLFloaterWorldMap::show(NULL, TRUE);
-}
+#include "llbottomtray.h"
 
 void handle_pay_by_id(const LLUUID& agent_id)
 {
@@ -88,43 +81,11 @@ void handle_mouselook(void*)
 }
 
 
-void handle_map(void*)
-{
-	LLFloaterWorldMap::toggle(NULL);
-}
-
-void handle_mini_map(void*)
-{
-	LLFloaterMap::toggleInstance();
-}
-
-
-void handle_find(void*)
-{
-	LLFloaterDirectory::toggleFind(NULL);
-}
-
-
-void handle_events(void*)
-{
-	LLFloaterDirectory::toggleEvents(NULL);
-}
-
-
-void handle_inventory(void*)
-{
-	// We're using the inventory, possibly for the
-	// first time.
-	LLFirstUse::useInventory();
-
-	LLInventoryView::toggleVisibility(NULL);
-}
-
-
 void handle_chat(void*)
 {
 	// give focus to chatbar if it's open but not focused
-	if (gSavedSettings.getBOOL("ChatVisible") && gFocusMgr.childHasKeyboardFocus(gChatBar))
+	if (gSavedSettings.getBOOL("ChatVisible") && gFocusMgr.childHasKeyboardFocus(
+		LLBottomTray::getInstance()->getChatBox()))
 	{
 		LLChatBar::stopChat();
 	}