aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorthickbrick2011-01-20 17:03:03 +0200
committerthickbrick2011-01-20 17:03:03 +0200
commit5b6c9def0d80473cef910d832bc07c4b4c11db3f (patch)
tree3dd2d4f0754e0297d4ca0635df8a8dd563267d75 /linden/indra/newview
parentAdd menu option for sculpt debugging in Advanced menu. (diff)
downloadmeta-impy-5b6c9def0d80473cef910d832bc07c4b4c11db3f.zip
meta-impy-5b6c9def0d80473cef910d832bc07c4b4c11db3f.tar.gz
meta-impy-5b6c9def0d80473cef910d832bc07c4b4c11db3f.tar.bz2
meta-impy-5b6c9def0d80473cef910d832bc07c4b4c11db3f.tar.xz
Fix #757: Missing Raycasting tool from Advanced menu
The code to render this tool is in the viewer, but the menu option was dropped when the advanced menu was moved to xml. This adds it back.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermenu.cpp4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml6
2 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index da7d815..95e686d 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -9192,6 +9192,10 @@ U32 info_display_from_string(std::string info_display)
9192 { 9192 {
9193 return LLPipeline::RENDER_DEBUG_GLOW; 9193 return LLPipeline::RENDER_DEBUG_GLOW;
9194 } 9194 }
9195 else if ("raycasting" == info_display)
9196 {
9197 return LLPipeline::RENDER_DEBUG_RAYCAST;
9198 }
9195 else if ("sculpt" == info_display) 9199 else if ("sculpt" == info_display)
9196 { 9200 {
9197 return LLPipeline::RENDER_DEBUG_SCULPTED; 9201 return LLPipeline::RENDER_DEBUG_SCULPTED;
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 9ff5048..534ca83 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
@@ -1279,6 +1279,12 @@
1279 <on_check function="Advanced.CheckInfoDisplay" 1279 <on_check function="Advanced.CheckInfoDisplay"
1280 userdata="glow" /> 1280 userdata="glow" />
1281 </menu_item_check> 1281 </menu_item_check>
1282 <menu_item_check name="Raycasting" label="Raycasting">
1283 <on_click function="Advanced.ToggleInfoDisplay"
1284 userdata="raycasting" />
1285 <on_check function="Advanced.CheckInfoDisplay"
1286 userdata="raycasting" />
1287 </menu_item_check>
1282 <menu_item_check name="Sculpt" label="Sculpt"> 1288 <menu_item_check name="Sculpt" label="Sculpt">
1283 <on_click function="Advanced.ToggleInfoDisplay" 1289 <on_click function="Advanced.ToggleInfoDisplay"
1284 userdata="sculpt" /> 1290 userdata="sculpt" />