summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-12 16:47:15 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-12 16:47:15 -0800
commit92cacc5581dc52058a65e305d8530f9da1445480 (patch)
treed06658448ef5aba5e9dfaca9be724d9e732ae022 /indra/newview/app_settings
parentfd9257a5f2649d7afbf65067c0fa4653fc81272c (diff)
parent74d5a6605bac7ae76889ce3697fc8f59d982d675 (diff)
Merge with product-engine
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>