summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-06-16 14:08:51 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-06-16 14:08:51 -0600
commit84d3eb1bee658ce26a422980b56dae6ba38f778d (patch)
tree886e7b06848707fb5ec3dca05300354f778a71c3 /indra/newview/skins/default
parentcc5beffdf45fcb3d76bd83af1dc7394ba6ea65d7 (diff)
parent482436019ad9ce306048d6734e43d0cdd56c583d (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml20
1 files changed, 4 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 266fd6cb5e..f4694180a1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -372,29 +372,17 @@
decimal_digits="0"
follows="left|top"
height="16"
- increment="2"
- initial_value="35"
- label="Max. avatar draw distance:"
+ increment="1"
+ initial_value="12"
+ label="Max. # of non-impostor avatars:"
label_width="185"
layout="topleft"
left_delta="0"
max_val="65"
min_val="1"
- name="MaxAvatarDrawDistance"
+ name="MaxNumberAvatarDrawn"
top_pad="4"
width="290" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="291"
- name="DrawDistanceMeterText3"
- top_delta="0"
- width="128">
- m
- </text>
<slider
control_name="RenderGlowResolutionPow"
decimal_digits="0"