diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-18 09:46:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-18 09:46:28 -0400 |
| commit | 2de13f80707d81f15234f3828fb338164e724a13 (patch) | |
| tree | d1fdaa5b0929380a380739f74983b5a0919e0407 | |
| parent | 4297b530d3f174bfeeb27c63d4ad3ef5192e755e (diff) | |
| parent | 4d2a64c4a408538ac795afc0bd1fd8e345bf2708 (diff) | |
merge changes for storm-1259
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 10 |
3 files changed, 17 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 163667c8ad..3b4f4de90e 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -254,6 +254,8 @@ Dale Glass VWR-2502 VWR-1358 VWR-2041 +Draconis Neurocam + STORM-1259 Drew Dri VWR-19683 Drewan Keats @@ -435,6 +437,7 @@ Jonathan Yap STORM-956 STORM-1095 STORM-1236 + STORM-1259 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8cfe91203a..2ed208bad1 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1000,6 +1000,10 @@ U32 info_display_from_string(std::string info_display) { return LLPipeline::RENDER_DEBUG_AGENT_TARGET; } + else if ("sculpt" == info_display) + { + return LLPipeline::RENDER_DEBUG_SCULPTED; + } else { return 0; diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index e8d5c97bbf..81046e99a0 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2348,6 +2348,16 @@ function="Advanced.ToggleInfoDisplay" parameter="raycast" /> </menu_item_check> + <menu_item_check + label="Sculpt" + name="Sculpt"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="sculpt" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="sculpt" /> + </menu_item_check> </menu> <menu create_jump_keys="true" |