1 files changed, 7 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 047f198..4ef01f3 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1687,7 +1687,13 @@ void LLViewerWindow::initWorldUI()
         //
 
         // Toolbox floater
-        init_menus();
+
+        // Make sure we only create menus once per session -- MC
+        if (!gMenuHolder)
+        {
+                init_menus();
+        }
+
         if (!gFloaterTools)
         {
                 gFloaterTools = new LLFloaterTools();