From 1587c4e3121713da16656187d1c0f5d85ad279d1 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 29 Jul 2010 01:30:23 +0200
Subject: fix crash on relog introduced in 66b8150d4ec94161887c

---
 linden/indra/newview/llviewermenu.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4012505..fb69389 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -546,6 +546,11 @@ void LLMenuParcelObserver::changed()
 // code required to calculate anything about the menus
 void pre_init_menus()
 {
+	if (gMenuHolder)
+	{
+		cleanup_menus();
+	}
+
 	// static information
 	LLColor4 color;
 	color = gColors.getColor( "MenuDefaultBgColor" );
-- 
cgit v1.1