diff options
author | Armin Weatherwax | 2010-02-20 17:07:34 +0100 |
---|---|---|
committer | Armin Weatherwax | 2010-04-28 19:15:02 +0200 |
commit | ac1eed6ff3e2ef03858256da76fd8408dcc79e9a (patch) | |
tree | 33ee9ac87dfd08b7c98a22a2023de134c2574d84 /linden/indra/newview/llviewermenu.h | |
parent | Merge commit 'jacek/next' into next (diff) | |
download | meta-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.h | 7 |
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; | |||
153 | extern LLPieMenu *gPieLand; | 153 | extern LLPieMenu *gPieLand; |
154 | 154 | ||
155 | // Pie menus | 155 | // Pie menus |
156 | /* | ||
156 | extern LLPieMenu *gPieSelfSimple; | 157 | extern LLPieMenu *gPieSelfSimple; |
157 | extern LLPieMenu *gPieAvatarSimple; | 158 | extern LLPieMenu *gPieAvatarSimple; |
158 | extern LLPieMenu *gPieObjectSimple; | 159 | extern LLPieMenu *gPieObjectSimple; |
159 | extern LLPieMenu *gPieAttachmentSimple; | 160 | extern LLPieMenu *gPieAttachmentSimple; |
160 | extern LLPieMenu *gPieHUDSimple; | 161 | extern LLPieMenu *gPieHUDSimple; |
161 | extern LLPieMenu *gPieLandSimple; | 162 | extern LLPieMenu *gPieLandSimple; |
162 | 163 | */ | |
163 | // Needed to build menus when attachment site list available | 164 | // Needed to build menus when attachment site list available |
164 | extern LLMenuGL* gAttachSubMenu; | 165 | extern LLMenuGL* gAttachSubMenu; |
165 | extern LLMenuGL* gDetachSubMenu; | 166 | extern LLMenuGL* gDetachSubMenu; |
@@ -173,8 +174,8 @@ extern LLPieMenu* gDetachBodyPartPieMenus[8]; | |||
173 | 174 | ||
174 | extern LLMenuItemCallGL* gAFKMenu; | 175 | extern LLMenuItemCallGL* gAFKMenu; |
175 | extern LLMenuItemCallGL* gBusyMenu; | 176 | extern LLMenuItemCallGL* gBusyMenu; |
176 | extern LLMenuItemCallGL* gMutePieMenu; | 177 | //extern LLMenuItemCallGL* gMutePieMenu; |
177 | extern LLMenuItemCallGL* gMuteObjectPieMenu; | 178 | //extern LLMenuItemCallGL* gMuteObjectPieMenu; |
178 | extern LLMenuItemCallGL* gBuyPassPieMenu; | 179 | extern LLMenuItemCallGL* gBuyPassPieMenu; |
179 | 180 | ||
180 | #endif | 181 | #endif |