Merged 'armin/grid-manager5' into login-manager

Conflicts:
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/llpanellogin.cpp

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index e83bc2d..8b3014b 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -575,6 +575,11 @@ void set_underclothes_menu_options()
 
 void init_menus()
 {
+        if (gMenuHolder)
+        {
+                cleanup_menus();
+        }
+
         S32 top = gViewerWindow->getRootView()->getRect().getHeight();
         S32 width = gViewerWindow->getRootView()->getRect().getWidth();