From 5b6c9def0d80473cef910d832bc07c4b4c11db3f Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Thu, 20 Jan 2011 17:03:03 +0200
Subject: 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.
---
 linden/indra/newview/llviewermenu.cpp                        | 4 ++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 ++++++
 2 files changed, 10 insertions(+)

(limited to 'linden/indra')

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)
 	{
 		return LLPipeline::RENDER_DEBUG_GLOW;
 	}
+	else if ("raycasting" == info_display)
+	{
+		return LLPipeline::RENDER_DEBUG_RAYCAST;
+	}
 	else if ("sculpt" == info_display)
 	{
 		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 @@
           <on_check function="Advanced.CheckInfoDisplay"
                     userdata="glow" />
         </menu_item_check>
+        <menu_item_check name="Raycasting" label="Raycasting">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="raycasting" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="raycasting" />
+        </menu_item_check>
         <menu_item_check name="Sculpt" label="Sculpt">
           <on_click function="Advanced.ToggleInfoDisplay"
                     userdata="sculpt" />
-- 
cgit v1.1