diff options
| author | David Seikel | 2011-04-26 21:30:21 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-26 21:30:21 +1000 |
| commit | da97e24c3b045d16589124496d032ffb9b4ca07f (patch) | |
| tree | 34d84cf4355f83e1a106d06a10ed2a4bb121fdc4 /linden/indra/newview/llviewermenu.h | |
| parent | Apparently there is a wrong client tag for firestorm out in the wild. (diff) | |
| parent | Changed version to Experimental 2011.04.19 (diff) | |
| download | meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.zip meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.gz meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.bz2 meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.xz | |
Merge remote-tracking branch 'imprudence/exp' into exp
Conflicts (for future reference):
linden/indra/llcommon/llstring.cpp
linden/indra/newview/llpanelnetwork.cpp
linden/indra/newview/llselectmgr.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/lltoolmgr.cpp
linden/indra/newview/llvoavatar.cpp
Diffstat (limited to 'linden/indra/newview/llviewermenu.h')
| -rw-r--r-- | linden/indra/newview/llviewermenu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h index f33c201..9c01598 100644 --- a/linden/indra/newview/llviewermenu.h +++ b/linden/indra/newview/llviewermenu.h | |||
| @@ -47,6 +47,8 @@ class LLObjectSelection; | |||
| 47 | void pre_init_menus(); | 47 | void pre_init_menus(); |
| 48 | void init_menus(); | 48 | void init_menus(); |
| 49 | void cleanup_menus(); | 49 | void cleanup_menus(); |
| 50 | // Updates grid-specific menu options after login | ||
| 51 | void update_grid_specific_menus(); | ||
| 50 | 52 | ||
| 51 | void show_debug_menus(); // checks for if menus should be shown first. | 53 | void show_debug_menus(); // checks for if menus should be shown first. |
| 52 | // builds either current or legacy pie menus depending upon LegacyPieEnabled | 54 | // builds either current or legacy pie menus depending upon LegacyPieEnabled |