diff --git a/doc/contributions.txt b/doc/contributions.txt index e7537b608b6ca6f16f31a2f3a3e92ae387091505..a6933a28324f65938d427eab74893b911a25e068 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -253,6 +253,8 @@ Dale Glass VWR-2502 VWR-1358 VWR-2041 +Draconis Neurocam + STORM-1259 Drew Dri VWR-19683 Drewan Keats @@ -433,6 +435,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 b4ec3c135b73dad5f09ee62b8c32a43ee9bafbf0..249b26acfc4b985ab4b55ac5502d28393a0dfd84 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -975,6 +975,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 8a85a331e5acb36f3d3f09b1fe9dfac6bc7025c7..5fdab898faa87ed9eb9ab6f3d6415b8f33fffe26 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2263,6 +2263,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"