From 770a0a2dea0bd503f88b35d3d440208bcd303e54 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 7 Jul 2014 10:28:54 -0500
Subject: MAINT-2980 Back out most changes related to upping the 512MB texture
 cap to unblock RC.

---
 indra/newview/skins/default/xui/en/floater_hardware_settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

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 40d54233e8..9deb0d2030 100755
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -155,9 +155,9 @@
      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"
-     control_name="TextureMemory"
      height="20"
      increment="16"
      initial_value="32"
@@ -167,7 +167,7 @@
      left="10"
      max_val="4096"
      name="GraphicsCardTextureMemory"
-     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."
+     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."
      top_pad="10"
      width="360" />
     <spinner
-- 
cgit v1.2.3