aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.h
diff options
context:
space:
mode:
authorArmin Weatherwax2010-02-20 17:07:34 +0100
committerArmin Weatherwax2010-04-28 19:15:02 +0200
commitac1eed6ff3e2ef03858256da76fd8408dcc79e9a (patch)
tree33ee9ac87dfd08b7c98a22a2023de134c2574d84 /linden/indra/newview/llviewermenu.h
parentMerge commit 'jacek/next' into next (diff)
downloadmeta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.zip
meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.gz
meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.bz2
meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.xz
fix: crash on relog; appearence self pie greyed out after relog.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermenu.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 560edc8..632f783 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -153,13 +153,14 @@ extern LLPieMenu *gPieHUD;
153extern LLPieMenu *gPieLand; 153extern LLPieMenu *gPieLand;
154 154
155// Pie menus 155// Pie menus
156/*
156extern LLPieMenu *gPieSelfSimple; 157extern LLPieMenu *gPieSelfSimple;
157extern LLPieMenu *gPieAvatarSimple; 158extern LLPieMenu *gPieAvatarSimple;
158extern LLPieMenu *gPieObjectSimple; 159extern LLPieMenu *gPieObjectSimple;
159extern LLPieMenu *gPieAttachmentSimple; 160extern LLPieMenu *gPieAttachmentSimple;
160extern LLPieMenu *gPieHUDSimple; 161extern LLPieMenu *gPieHUDSimple;
161extern LLPieMenu *gPieLandSimple; 162extern LLPieMenu *gPieLandSimple;
162 163*/
163// Needed to build menus when attachment site list available 164// Needed to build menus when attachment site list available
164extern LLMenuGL* gAttachSubMenu; 165extern LLMenuGL* gAttachSubMenu;
165extern LLMenuGL* gDetachSubMenu; 166extern LLMenuGL* gDetachSubMenu;
@@ -173,8 +174,8 @@ extern LLPieMenu* gDetachBodyPartPieMenus[8];
173 174
174extern LLMenuItemCallGL* gAFKMenu; 175extern LLMenuItemCallGL* gAFKMenu;
175extern LLMenuItemCallGL* gBusyMenu; 176extern LLMenuItemCallGL* gBusyMenu;
176extern LLMenuItemCallGL* gMutePieMenu; 177//extern LLMenuItemCallGL* gMutePieMenu;
177extern LLMenuItemCallGL* gMuteObjectPieMenu; 178//extern LLMenuItemCallGL* gMuteObjectPieMenu;
178extern LLMenuItemCallGL* gBuyPassPieMenu; 179extern LLMenuItemCallGL* gBuyPassPieMenu;
179 180
180#endif 181#endif