summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-02-28 13:35:03 -0600
committerDave Parks <davep@lindenlab.com>2014-02-28 13:35:03 -0600
commit6abbe4cf55c2e4a6a879b00971bc5d70a7c58e8a (patch)
tree6e3f07a52f3fe26b6ec91222f53b365b12c0c58d /indra/newview/skins/default/xui
parentd9d2659e11991ba41a052e011c610a213872d705 (diff)
parent7835d48f6d6f26e37a8ff4528dc5c2faf4b8ebf7 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/skins/default/xui')
-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"