diff options
| author | Richard Linden <none@none> | 2011-03-08 16:47:42 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-08 16:47:42 -0800 |
| commit | bc22d31caee8479a89366155062df45302021bba (patch) | |
| tree | 2989fdee4329b37d75e728030466d129efa09241 /indra/newview/app_settings | |
| parent | 0e5fd6a1483e12a46dc94f318f3e43ec328def54 (diff) | |
| parent | f3e37e047206b909c212a02493be6972fba2c8aa (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social/
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 24 |
2 files changed, 46 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..94a49f2cef 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12487,5 +12487,27 @@ <key>Value</key> <integer>1</integer> </map> -</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> |