diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-09 11:52:43 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-09 11:52:43 -0800 |
| commit | 90c824d10dbf4468dfdd9ffebf7456f81964391a (patch) | |
| tree | 812cc4dd06d128fbbf1e7c960f96e5476eb925f6 /indra/newview/app_settings | |
| parent | 6158929e3ee87bc879c99d35963a151006394ed7 (diff) | |
| parent | f47a9a4ea3d40ecaf03e853469b1570a4ad72ce7 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 26 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 24 |
2 files changed, 47 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ced4c3a2eb..80edf5d3c9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -617,7 +617,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html</string> + <string></string> </map> <key>AvatarBakedTextureUploadTimeout</key> <map> @@ -2566,7 +2566,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html</string> + <string></string> </map> <key>DisableCameraConstraints</key> <map> @@ -12498,5 +12498,27 @@ <key>Value</key> <integer>1</integer> </map> + <key>LogInventoryDecline</key> + <map> + <key>Comment</key> + <string>Log in system chat whenever an inventory offer is declined</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>UseHTTPInventory</key> + <map> + <key>Comment</key> + <string>Allow use of http inventory transfers instead of UDP</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 6e0053a3a3..b5fb85c929 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -61,7 +61,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://interest.secondlife.com/static/viewer/howto/index.html</string> + <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html</string> </map> <key>PreferredMaturity</key> <map> @@ -325,5 +325,27 @@ <key>Value</key> <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html</string> </map> + <key>LogInventoryDecline</key> + <map> + <key>Comment</key> + <string>Log in system chat whenever an inventory offer is declined</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>UseHTTPInventory</key> + <map> + <key>Comment</key> + <string>Allow use of http inventory transfers instead of UDP</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |