aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorArmin Weatherwax2010-07-29 01:30:23 +0200
committerJacek Antonelli2010-08-01 15:59:32 -0500
commit1587c4e3121713da16656187d1c0f5d85ad279d1 (patch)
tree14260fb328e97851a8e53fb3e2a2179f1785be13 /linden/indra
parentsome more HUDEffect revamp (diff)
downloadmeta-impy-1587c4e3121713da16656187d1c0f5d85ad279d1.zip
meta-impy-1587c4e3121713da16656187d1c0f5d85ad279d1.tar.gz
meta-impy-1587c4e3121713da16656187d1c0f5d85ad279d1.tar.bz2
meta-impy-1587c4e3121713da16656187d1c0f5d85ad279d1.tar.xz
fix crash on relog introduced in 66b8150d4ec94161887c
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermenu.cpp5
1 files changed, 5 insertions, 0 deletions
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()
546// code required to calculate anything about the menus 546// code required to calculate anything about the menus
547void pre_init_menus() 547void pre_init_menus()
548{ 548{
549 if (gMenuHolder)
550 {
551 cleanup_menus();
552 }
553
549 // static information 554 // static information
550 LLColor4 color; 555 LLColor4 color;
551 color = gColors.getColor( "MenuDefaultBgColor" ); 556 color = gColors.getColor( "MenuDefaultBgColor" );