diff options
author | McCabe Maxsted | 2009-09-07 00:43:37 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-07 00:43:37 -0700 |
commit | 056f41c8542e60ea57af83bd18caa01db44a15c5 (patch) | |
tree | 6adb06ac49d9594a6220ed63904b284c5ec9feab /linden/indra/newview | |
parent | Fixed reference to missing colors.xml entry (diff) | |
download | meta-impy-056f41c8542e60ea57af83bd18caa01db44a15c5.zip meta-impy-056f41c8542e60ea57af83bd18caa01db44a15c5.tar.gz meta-impy-056f41c8542e60ea57af83bd18caa01db44a15c5.tar.bz2 meta-impy-056f41c8542e60ea57af83bd18caa01db44a15c5.tar.xz |
Fixed ground sit menu entry missing check
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 17 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 4c91a0a..cfc9a14 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -7589,6 +7589,22 @@ class LLAdvancedToggleSit: public view_listener_t | |||
7589 | } | 7589 | } |
7590 | }; | 7590 | }; |
7591 | 7591 | ||
7592 | class LLAdvancedCheckSit : public view_listener_t | ||
7593 | { | ||
7594 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | ||
7595 | { | ||
7596 | if(gAgent.getAvatarObject()->mIsSitting) | ||
7597 | { | ||
7598 | gMenuHolder->findControl(userdata["control"].asString())->setValue(true); | ||
7599 | } | ||
7600 | else | ||
7601 | { | ||
7602 | gMenuHolder->findControl(userdata["control"].asString())->setValue(false); | ||
7603 | } | ||
7604 | return true; | ||
7605 | } | ||
7606 | }; | ||
7607 | |||
7592 | 7608 | ||
7593 | ///////////// | 7609 | ///////////// |
7594 | // PHANTOM // | 7610 | // PHANTOM // |
@@ -9819,6 +9835,7 @@ void initialize_menus() | |||
9819 | addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole"); | 9835 | addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole"); |
9820 | addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides"); | 9836 | addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides"); |
9821 | addMenu(new LLAdvancedToggleSit(), "Advanced.ToggleSit"); | 9837 | addMenu(new LLAdvancedToggleSit(), "Advanced.ToggleSit"); |
9838 | addMenu(new LLAdvancedCheckSit(), "Emerald.CheckSit"); | ||
9822 | addMenu(new LLAdvancedTogglePhantom(), "Advanced.TogglePhantom"); | 9839 | addMenu(new LLAdvancedTogglePhantom(), "Advanced.TogglePhantom"); |
9823 | addMenu(new LLAdvancedCheckPhantom(), "Advanced.CheckPhantom"); | 9840 | addMenu(new LLAdvancedCheckPhantom(), "Advanced.CheckPhantom"); |
9824 | addMenu(new LLAdvancedToggleAssetBrowser(),"Advanced.ToggleAssetBrowser"); | 9841 | addMenu(new LLAdvancedToggleAssetBrowser(),"Advanced.ToggleAssetBrowser"); |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 5407061..a53e339 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | |||
@@ -887,6 +887,7 @@ | |||
887 | <menu_item_call label="Ground Sit" name="Ground Sit" | 887 | <menu_item_call label="Ground Sit" name="Ground Sit" |
888 | shortcut="control|alt|s"> | 888 | shortcut="control|alt|s"> |
889 | <on_click function="Advanced.ToggleSit" userdata="" /> | 889 | <on_click function="Advanced.ToggleSit" userdata="" /> |
890 | <on_Check function="Advanced.CheckSit" userdata="" /> | ||
890 | </menu_item_call> | 891 | </menu_item_call> |
891 | <menu_item_check label="Phantom Avatar" name="Phantom" | 892 | <menu_item_check label="Phantom Avatar" name="Phantom" |
892 | shortcut="control|alt|p"> | 893 | shortcut="control|alt|p"> |