From e0be0f4d1a35d4f3fce701b9895fefbbe5ca459f Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 11 May 2013 21:06:10 +1000
Subject: Fix http://redmine.kokuaviewer.org/issues/944 - Shadow Frustra
missing from Advanced Menu > Rendering > Info Display
---
linden/indra/newview/llviewermenu.cpp | 5 ++++-
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
(limited to 'linden')
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)
sub_menu->append(new LLMenuItemCheckGL("Octree", &LLPipeline::toggleRenderDebug, NULL,
&LLPipeline::toggleRenderDebugControl,
(void*)LLPipeline::RENDER_DEBUG_OCTREE));
- // For Imprudence 1.3 - need to XUIfy
sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL,
&LLPipeline::toggleRenderDebugControl,
(void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA));
@@ -9263,6 +9262,10 @@ U32 info_display_from_string(std::string info_display)
{
return LLPipeline::RENDER_DEBUG_SCULPTED;
}
+ else if ("shadow frusta" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA;
+ }
else
{
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 @@
+
+
+
+