Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

2012-07-02 21:28:19 -04:00
parent e6689f830a 9ddbc132bf
commit 4435e7ade3
2 changed files with 21 additions and 20 deletions
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -875,8 +875,6 @@ void init_menus()
 	gLoginMenuBarView->setBackgroundColor( color );

 	gMenuHolder->addChild(gLoginMenuBarView);
-	
-	LLToolMgr::getInstance()->initMenu(sMenus);
 }


@@ -9510,4 +9508,6 @@ void initialize_menus()
 		addMenu(new RlvEnableIfNot(), "RLV.EnableIfNot");
 	}
 // [/RLVa:KB]
+
+	LLToolMgr::getInstance()->initMenu(sMenus);
 }