From a17a3f1feb134bbbf0091f19ac7a93ac89815956 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 3 Jun 2010 06:55:37 -0700
Subject: Make sure we only create menus once per session

---
 linden/indra/newview/llviewerwindow.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'linden')

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();
-- 
cgit v1.1