summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2009-12-30 00:45:11 -0500
committerKent Quirk <q@lindenlab.com>2009-12-30 00:45:11 -0500
commitf4e2287175ab1bc9d09fc73435a828071b9e2ba5 (patch)
treea3e863efea52678e6ea3f19302bef1d5500fcf42 /indra/newview/app_settings
parent904de223b6da701e2512b8d8bf0d3be478421c78 (diff)
parent383cb255e0ff619fa4ee3fc0b1dc6a37643d3bc1 (diff)
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7296c5d947..0ee39c2fc8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2344,6 +2344,17 @@
<key>Value</key>
<string>89556747-24cb-43ed-920b-47caed15465f</string>
</map>
+ <key>DefaultUploadCost</key>
+ <map>
+ <key>Comment</key>
+ <string>Default sound/image/file upload cost(in case economy data is not available).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>10</integer>
+ </map>
<key>DisableCameraConstraints</key>
<map>
<key>Comment</key>