summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-02-27 18:06:48 -0600
committerDave Parks <davep@lindenlab.com>2014-02-27 18:06:48 -0600
commit7835d48f6d6f26e37a8ff4528dc5c2faf4b8ebf7 (patch)
tree891c61ee0be7c2209f08ec99697564b60d9122f4 /indra/newview/skins/default
parent7ad70e0f245726c98bff382539a60d591ea67aba (diff)
parenta8e22e11c5d26b3cdfa2d67919fdde8272d52ea4 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_hardware_settings.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 9deb0d2030..05594c2d86 100755
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -155,13 +155,12 @@
tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
width="315" />
<slider
- control_name="TextureMemory"
decimal_digits="0"
follows="left|top"
height="20"
increment="16"
initial_value="32"
- label="Texture Memory (MB):"
+ label="Video Memory (MB):"
label_width="195"
layout="topleft"
left="10"