diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-03-11 17:42:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-03-11 17:42:02 -0500 |
| commit | 02423199e89473c6aad2c6ab121d44c1f238dbd1 (patch) | |
| tree | 4bb804729c65a892919ac5ae10a208c4dc0a9b1b /indra/newview/skins/default | |
| parent | cf2a180823e4e6daa0649ab54a5f7ed6ba14dbb2 (diff) | |
| parent | 6abbe4cf55c2e4a6a879b00971bc5d70a7c58e8a (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/skins/default')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_hardware_settings.xml | 3 |
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" |