summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-06-23 23:10:45 -0500
committerDave Parks <davep@lindenlab.com>2014-06-23 23:10:45 -0500
commit07e7fbb4ade2e05c4863ca1e40ce26304449697d (patch)
tree5acffd42d0350550843db2d9aaf089662d5aeddb /indra/newview/skins/default
parent246d501440deaec8831d68890bc0d708e654dda8 (diff)
parent90ee53f5a1ac47ec5f8eb84bc543376a089e0d55 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_hardware_settings.xml5
1 files changed, 3 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 05594c2d86..40d54233e8 100755
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -157,16 +157,17 @@
<slider
decimal_digits="0"
follows="left|top"
+ control_name="TextureMemory"
height="20"
increment="16"
initial_value="32"
- label="Video Memory (MB):"
+ label="Texture Memory (MB):"
label_width="195"
layout="topleft"
left="10"
max_val="4096"
name="GraphicsCardTextureMemory"
- tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
+ tool_tip="Amount of memory to allocate for textures. Defaults to one third of total graphics memory. Reducing this may improve performance but may also make textures blurry. Increasing may make textures sharper, but may also cause frame stalls and instability."
top_pad="10"
width="360" />
<spinner