From 4d2a64c4a408538ac795afc0bd1fd8e345bf2708 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 16 May 2011 16:34:26 -0400
Subject: [PATCH] STORM-1259 Sculpt dimension meta-data view missing from 2.x,
was possible to see in 1.23
---
doc/contributions.txt | 3 +++
indra/newview/llviewermenu.cpp | 4 ++++
indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
3 files changed, 17 insertions(+)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e7537b608b6..a6933a28324 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 b4ec3c135b7..249b26acfc4 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 8a85a331e5a..5fdab898faa 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"
--
GitLab