diff options
author | David Walter Seikel | 2013-05-11 21:06:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-05-11 21:06:10 +1000 |
commit | e0be0f4d1a35d4f3fce701b9895fefbbe5ca459f (patch) | |
tree | 6401b50d7280b79542cba90d3db215bdac5304f3 | |
parent | Retroactively update the release notes for 1.4.0 beta 1 and 2, mostly by copy... (diff) | |
download | meta-impy-e0be0f4d1a35d4f3fce701b9895fefbbe5ca459f.zip meta-impy-e0be0f4d1a35d4f3fce701b9895fefbbe5ca459f.tar.gz meta-impy-e0be0f4d1a35d4f3fce701b9895fefbbe5ca459f.tar.bz2 meta-impy-e0be0f4d1a35d4f3fce701b9895fefbbe5ca459f.tar.xz |
Fix http://redmine.kokuaviewer.org/issues/944 - Shadow Frustra missing from Advanced Menu > Rendering > Info Display
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 5 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 7fd58db..1ee00d0 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -1258,7 +1258,6 @@ void init_debug_rendering_menu(LLMenuGL* menu) | |||
1258 | sub_menu->append(new LLMenuItemCheckGL("Octree", &LLPipeline::toggleRenderDebug, NULL, | 1258 | sub_menu->append(new LLMenuItemCheckGL("Octree", &LLPipeline::toggleRenderDebug, NULL, |
1259 | &LLPipeline::toggleRenderDebugControl, | 1259 | &LLPipeline::toggleRenderDebugControl, |
1260 | (void*)LLPipeline::RENDER_DEBUG_OCTREE)); | 1260 | (void*)LLPipeline::RENDER_DEBUG_OCTREE)); |
1261 | // For Imprudence 1.3 - need to XUIfy | ||
1262 | sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL, | 1261 | sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL, |
1263 | &LLPipeline::toggleRenderDebugControl, | 1262 | &LLPipeline::toggleRenderDebugControl, |
1264 | (void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA)); | 1263 | (void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA)); |
@@ -9263,6 +9262,10 @@ U32 info_display_from_string(std::string info_display) | |||
9263 | { | 9262 | { |
9264 | return LLPipeline::RENDER_DEBUG_SCULPTED; | 9263 | return LLPipeline::RENDER_DEBUG_SCULPTED; |
9265 | } | 9264 | } |
9265 | else if ("shadow frusta" == info_display) | ||
9266 | { | ||
9267 | return LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA; | ||
9268 | } | ||
9266 | else | 9269 | else |
9267 | { | 9270 | { |
9268 | return 0; | 9271 | return 0; |
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 c66bce0..284f1d3 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 | |||
@@ -1327,6 +1327,12 @@ | |||
1327 | <on_check function="Advanced.CheckInfoDisplay" | 1327 | <on_check function="Advanced.CheckInfoDisplay" |
1328 | userdata="sculpt" /> | 1328 | userdata="sculpt" /> |
1329 | </menu_item_check> | 1329 | </menu_item_check> |
1330 | <menu_item_check name="ShadowFrusta" label="Shadow Frusta"> | ||
1331 | <on_click function="Advanced.ToggleInfoDisplay" | ||
1332 | userdata="shadow frusta" /> | ||
1333 | <on_check function="Advanced.CheckInfoDisplay" | ||
1334 | userdata="shadow frusta" /> | ||
1335 | </menu_item_check> | ||
1330 | <menu_item_check name="Vectorize Perf Test" | 1336 | <menu_item_check name="Vectorize Perf Test" |
1331 | label="Vectorize Perf Test"> | 1337 | label="Vectorize Perf Test"> |
1332 | <on_click function="ToggleControl" | 1338 | <on_click function="ToggleControl" |