summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-02-27 17:49:50 -0600
committerDave Parks <davep@lindenlab.com>2014-02-27 17:49:50 -0600
commita8e22e11c5d26b3cdfa2d67919fdde8272d52ea4 (patch)
treed37551dbfb1ae24ae73409848faa6416e70272d5 /indra/newview/skins
parentbfe520387ed3061ba55ea2e58c565016e7a3159e (diff)
MAINT-2980 Rename "Texture Memory" to "Video Memory" in hardware floater and increase limit.
Limit should be however much vram is installed, but underneath the hood, fudge how much memory is used for textures to avoid swapping. Also, catch exceptions when attempting to build a GL context on windows and display an error dialog instead of crashing.
Diffstat (limited to 'indra/newview/skins')
-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"