From a75964c99310480d766546a9b6bdb856eeaea32b Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 20 Jan 2015 02:00:25 -0500
Subject: [PATCH] Move menu stuff out of lltoolmgr and into llviewermenu.cpp

---
 indra/newview/lltoolmgr.cpp    | 28 ----------------------------
 indra/newview/lltoolmgr.h      |  5 -----
 indra/newview/llviewermenu.cpp | 19 ++++++++++++++++++-
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index 542256af0..2a3facf17 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -55,8 +55,6 @@
 #include "llagent.h"
 #include "llagentcamera.h"
 #include "llviewercontrol.h"
-#include "llmemberlistener.h"
-#include "llevent.h"
 #include "llviewerjoystick.h"
 #include "llviewermenu.h"
 #include "llviewerparcelmgr.h"
@@ -77,24 +75,6 @@ LLToolset*		gFaceEditToolset	= NULL;
 /////////////////////////////////////////////////////
 // LLToolMgr
 
-class LLViewBuildMode : public LLMemberListener<LLView>
-{
-	bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata)
-	{
-		LLToolMgr::getInstance()->toggleBuildMode();
-		return true;
-	}
-};
-class LLViewCheckBuildMode : public LLMemberListener<LLView>
-{
-	bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata)
-	{
-		bool new_value = LLToolMgr::getInstance()->inEdit();
-		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-		return true;
-	}
-};
-
 LLToolMgr::LLToolMgr()
 	:
 	mBaseTool(NULL), 
@@ -114,14 +94,6 @@ LLToolMgr::LLToolMgr()
 	gFaceEditToolset	= new LLToolset("FaceEdit");
 }
 
-void LLToolMgr::initMenu(std::vector<LLPointer<LLMemberListener<LLView> > >& menu_list)
-{
-	menu_list.push_back(new LLViewBuildMode());
-	menu_list.back()->registerListener(gMenuHolder, "View.BuildMode");
-	menu_list.push_back(new LLViewCheckBuildMode());
-	menu_list.back()->registerListener(gMenuHolder, "View.CheckBuildMode");
-}
-
 void LLToolMgr::initTools()
 {
 	static BOOL initialized = FALSE;
diff --git a/indra/newview/lltoolmgr.h b/indra/newview/lltoolmgr.h
index 31a481b17..0cb642e82 100644
--- a/indra/newview/lltoolmgr.h
+++ b/indra/newview/lltoolmgr.h
@@ -35,11 +35,8 @@
 
 #include "llkeyboard.h"
 
-#include "llmemberlistener.h"
-
 class LLTool;
 class LLToolset;
-class LLView;
 
 // Key bindings for common operations
 const MASK MASK_VERTICAL		= MASK_CONTROL;
@@ -55,8 +52,6 @@ public:
 	LLToolMgr();
 	~LLToolMgr();
 
-	void			initMenu(std::vector<LLPointer<LLMemberListener<LLView> > >& menu_list);
-
 	// Must be called after gSavedSettings set up.
 	void			initTools();
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 85faa1c0f..5ad5d60c4 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9574,7 +9574,24 @@ void initialize_menus()
 
 	add_radar_listeners();
 
-	LLToolMgr::getInstance()->initMenu(sMenus);
+	class LLViewBuildMode : public view_listener_t
+	{
+		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+		{
+			LLToolMgr::getInstance()->toggleBuildMode();
+			return true;
+		}
+	};
+	class LLViewCheckBuildMode : public view_listener_t
+	{
+		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+		{
+			gMenuHolder->findControl(userdata["control"].asString())->setValue(LLToolMgr::getInstance()->inEdit());
+			return true;
+		}
+	};
+	addMenu(new LLViewBuildMode(), "View.BuildMode");
+	addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
 }
 
 void region_change()