summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-13 19:26:20 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-13 19:26:20 -0500
commit3194c89177e75db524c2c4e09cd40f239426a774 (patch)
tree6b042ef3c8a9e983659d128296aeeedefa62fefd /indra/newview/app_settings
parent4bb5cd169b297efbcf1bdb58a45be24932cf8241 (diff)
parentc5732c824fcde73953cfdf971ba35a88abd54d0c (diff)
Merging viewer2 changes into avp branch
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index eb4148f92f..8ad52784d3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3563,7 +3563,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>400</integer>
+ <integer>305</integer>
</map>
<key>HelpUseLocal</key>
<map>
@@ -4917,7 +4917,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>350</integer>
+ <integer>305</integer>
</map>
<key>NotificationToastLifeTime</key>
<map>