diff options
| author | Jonathan Yap <none@none> | 2011-05-16 16:34:26 -0400 | 
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-05-16 16:34:26 -0400 | 
| commit | 4d2a64c4a408538ac795afc0bd1fd8e345bf2708 (patch) | |
| tree | 853e8caf1e890d3727e880b77c690874b65d4ac4 | |
| parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
STORM-1259 Sculpt dimension meta-data view missing from 2.x, was possible to see in 1.23
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 10 | 
3 files changed, 17 insertions, 0 deletions
| diff --git a/doc/contributions.txt b/doc/contributions.txt index e7537b608b..a6933a2832 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 b4ec3c135b..249b26acfc 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 8a85a331e5..5fdab898fa 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" | 
