summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2016-10-11 16:06:04 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2016-10-11 16:06:04 +0300
commit061b918deea9a07e9d3e44e18a86afefc3740898 (patch)
tree520a7109e91cb33fd0680e0b6cc7474b215f164a /indra/newview/app_settings
parent4617e07b3795e46c2037462f738ab81b35bd7294 (diff)
parent6be5e1eb01a5b12ee4152ae9d4f53110a4bea246 (diff)
Merged in MAINT-6792 (pull request #22)
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 674923e88d..460c0809a6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10148,16 +10148,16 @@
<key>Value</key>
<integer>6</integer>
</map>
- <key>RenderHUDTexturesVirtualMemoryWarning</key>
+ <key>RenderHUDTexturesMemoryWarning</key>
<map>
<key>Comment</key>
- <string>Viewer will warn user about HUD textures using memory above this value (Virtual memory, in pixels)</string>
+ <string>Viewer will warn user about HUD textures using memory above this value (in bytes)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>10000000</integer>
+ <integer>32000000</integer>
</map>
<key>RenderAutoMuteSurfaceAreaLimit</key>
<map>