diff options
author | Jacek Antonelli | 2009-01-27 02:47:35 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-27 03:17:56 -0600 |
commit | 2722047e162730d33806e15c033803435a906d7b (patch) | |
tree | b2a0745c4a90fe9148753a5c4f99257a90c0a426 /linden | |
parent | Set GST_PLUGIN_PATH for Linux. (diff) | |
download | meta-impy-2722047e162730d33806e15c033803435a906d7b.zip meta-impy-2722047e162730d33806e15c033803435a906d7b.tar.gz meta-impy-2722047e162730d33806e15c033803435a906d7b.tar.bz2 meta-impy-2722047e162730d33806e15c033803435a906d7b.tar.xz |
Restored View > Toolbar and Show HUD Attachments.
Partial revert of earlier commit e79a1cc5.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 29 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 10 |
2 files changed, 39 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 4c6de79..c4cbf84 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -5073,6 +5073,10 @@ class LLShowFloater : public view_listener_t | |||
5073 | { | 5073 | { |
5074 | LLFloaterPreference::show(NULL); | 5074 | LLFloaterPreference::show(NULL); |
5075 | } | 5075 | } |
5076 | else if (floater_name == "toolbar") | ||
5077 | { | ||
5078 | LLToolBar::toggle(NULL); | ||
5079 | } | ||
5076 | else if (floater_name == "chat history") | 5080 | else if (floater_name == "chat history") |
5077 | { | 5081 | { |
5078 | LLFloaterChat::toggleInstance(LLSD()); | 5082 | LLFloaterChat::toggleInstance(LLSD()); |
@@ -5205,6 +5209,10 @@ class LLFloaterVisible : public view_listener_t | |||
5205 | { | 5209 | { |
5206 | new_value = LLFloaterMyFriends::instanceVisible(0); | 5210 | new_value = LLFloaterMyFriends::instanceVisible(0); |
5207 | } | 5211 | } |
5212 | else if (floater_name == "toolbar") | ||
5213 | { | ||
5214 | new_value = LLToolBar::visible(NULL); | ||
5215 | } | ||
5208 | else if (floater_name == "chat history") | 5216 | else if (floater_name == "chat history") |
5209 | { | 5217 | { |
5210 | new_value = LLFloaterChat::instanceVisible(); | 5218 | new_value = LLFloaterChat::instanceVisible(); |
@@ -7203,6 +7211,25 @@ class LLViewCheckRenderType : public view_listener_t | |||
7203 | } | 7211 | } |
7204 | }; | 7212 | }; |
7205 | 7213 | ||
7214 | class LLViewShowHUDAttachments : public view_listener_t | ||
7215 | { | ||
7216 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | ||
7217 | { | ||
7218 | LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments; | ||
7219 | return true; | ||
7220 | } | ||
7221 | }; | ||
7222 | |||
7223 | class LLViewCheckHUDAttachments : public view_listener_t | ||
7224 | { | ||
7225 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | ||
7226 | { | ||
7227 | bool new_value = LLPipeline::sShowHUDAttachments; | ||
7228 | gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value); | ||
7229 | return true; | ||
7230 | } | ||
7231 | }; | ||
7232 | |||
7206 | class LLEditEnableTakeOff : public view_listener_t | 7233 | class LLEditEnableTakeOff : public view_listener_t |
7207 | { | 7234 | { |
7208 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 7235 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
@@ -9657,6 +9684,7 @@ void initialize_menus() | |||
9657 | addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon"); | 9684 | addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon"); |
9658 | addMenu(new LLViewBeaconWidth(), "View.BeaconWidth"); | 9685 | addMenu(new LLViewBeaconWidth(), "View.BeaconWidth"); |
9659 | addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType"); | 9686 | addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType"); |
9687 | addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments"); | ||
9660 | addMenu(new LLViewZoomOut(), "View.ZoomOut"); | 9688 | addMenu(new LLViewZoomOut(), "View.ZoomOut"); |
9661 | addMenu(new LLViewZoomIn(), "View.ZoomIn"); | 9689 | addMenu(new LLViewZoomIn(), "View.ZoomIn"); |
9662 | addMenu(new LLViewZoomDefault(), "View.ZoomDefault"); | 9690 | addMenu(new LLViewZoomDefault(), "View.ZoomDefault"); |
@@ -9671,6 +9699,7 @@ void initialize_menus() | |||
9671 | addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); | 9699 | addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); |
9672 | addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled"); | 9700 | addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled"); |
9673 | addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); | 9701 | addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); |
9702 | addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments"); | ||
9674 | 9703 | ||
9675 | // World menu | 9704 | // World menu |
9676 | addMenu(new LLWorldChat(), "World.Chat"); | 9705 | addMenu(new LLWorldChat(), "World.Chat"); |
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 a741b94..eb32ee0 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 | |||
@@ -281,6 +281,10 @@ | |||
281 | <on_click function="ShowFloater" userdata="inworld browser" /> | 281 | <on_click function="ShowFloater" userdata="inworld browser" /> |
282 | </menu_item_call> | 282 | </menu_item_call> |
283 | <menu_item_separator /> | 283 | <menu_item_separator /> |
284 | <menu_item_check name="Toolbar" label="Toolbar"> | ||
285 | <on_click function="ShowFloater" userdata="toolbar" /> | ||
286 | <on_check function="FloaterVisible" userdata="toolbar" /> | ||
287 | </menu_item_check> | ||
284 | <menu_item_check name="Chat History" label="Local Chat" | 288 | <menu_item_check name="Chat History" label="Local Chat" |
285 | shortcut="control|H"> | 289 | shortcut="control|H"> |
286 | <on_click function="ShowFloater" userdata="chat history" /> | 290 | <on_click function="ShowFloater" userdata="chat history" /> |
@@ -440,6 +444,12 @@ | |||
440 | </menu_item_call> | 444 | </menu_item_call> |
441 | </menu> | 445 | </menu> |
442 | </menu> | 446 | </menu> |
447 | <menu_item_check name="Show HUD Attachments" | ||
448 | label="Show HUD Attachments" | ||
449 | shortcut="alt|shift|H"> | ||
450 | <on_click function="View.ShowHUDAttachments" userdata="" /> | ||
451 | <on_check function="View.CheckHUDAttachments" /> | ||
452 | </menu_item_check> | ||
443 | <menu_item_separator /> | 453 | <menu_item_separator /> |
444 | <menu name="Zoom Level" create_jump_keys="true" | 454 | <menu name="Zoom Level" create_jump_keys="true" |
445 | label="Zoom Level" opaque="true" tear_off="true"> | 455 | label="Zoom Level" opaque="true" tear_off="true"> |