diff options
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 27c3e42a37..709b4e145c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3848,7 +3848,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>https://www.xstreetsl.com/modules.php?name=Marketplace&CategoryID=233</string> + <string>https://marketplace.secondlife.com/products/search?search[category_id]=200&search[maturity][]=General&search[page]=1&search[per_page]=12</string> </map> <key>GridCrossSections</key> <map> @@ -4872,7 +4872,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://viewer-login.agni.lindenlab.com/</string> + <string/> </map> <key>LosslessJ2CUpload</key> <map> @@ -12578,13 +12578,21 @@ <key>WatchdogEnabled</key> <map> <key>Comment</key> +<<<<<<< local <string>Controls whether the thread watchdog timer is activated.</string> +======= + <string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string> +>>>>>>> other <key>Persist</key> <integer>0</integer> <key>Type</key> <string>S32</string> <key>Value</key> +<<<<<<< local + <integer>-1</integer> +======= <integer>0</integer> +>>>>>>> other </map> <key>WaterGLFogDensityScale</key> <map> |