summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-07-12 14:07:26 -0500
committerDave Parks <davep@lindenlab.com>2011-07-12 14:07:26 -0500
commit5a767e4cebed49a3a2934b21fd2f265a245828f4 (patch)
treed78411123183f4e796af5795f6b683f492b4159e /indra/newview
parent502f01bfef3217ff81eac1df045785c5c9e1764f (diff)
parentbb44da4613595f7bf03d4c21d053917ce2df2b00 (diff)
merge
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_model_preview.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index e75511e2b3..1d4a1d4827 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -102,9 +102,9 @@
width="80"
word_wrap="true"
>
-Streaming:
+Download:
Physics:
-Simulation:
+Server:
Prim equivs:
</text>
@@ -123,7 +123,8 @@ Prim equivs:
[EQ]
</text>
-
+
+<!--
<text
height="65"
top_delta="0"
@@ -153,6 +154,7 @@ L$ [INSTANCES]
L$ [TEXTURES]
L$ [MODEL]
</text>
+ -->
<tab_container
follows="right|top|bottom"