summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-14 13:19:58 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-14 13:19:58 -0400
commit788f1c4f4dd05387a707c1e1348be39f469d4374 (patch)
tree54f4556ab3c44bbe05fd8ccf3b0b4eae1c85e1c1
parent13705596af001078d185dfe5aa7e98d9642f8c8a (diff)
SH-1146 FIXED Menu typo
Trivial fix to menu entry for rendering types entry.
-rwxr-xr-xindra/newview/llviewermenu.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml8
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3323828d4f..89d533da28 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -697,7 +697,7 @@ U32 render_type_from_string(std::string render_type)
{
return LLPipeline::RENDER_TYPE_AVATAR;
}
- else if ("surfacePath" == render_type)
+ else if ("surfacePatch" == render_type)
{
return LLPipeline::RENDER_TYPE_TERRAIN;
}
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 38e9165613..8655a6bf97 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1355,15 +1355,15 @@
parameter="character" />
</menu_item_check>
<menu_item_check
- label="SurfacePath"
- name="SurfacePath"
+ label="Surface Patch"
+ name="Surface Patch"
shortcut="control|alt|shift|5">
<menu_item_check.on_check
function="Advanced.CheckRenderType"
- parameter="surfacePath" />
+ parameter="surfacePatch" />
<menu_item_check.on_click
function="Advanced.ToggleRenderType"
- parameter="surfacePath" />
+ parameter="surfacePatch" />
</menu_item_check>
<menu_item_check
label="Sky"