Merge remote-tracking branch 'lirusato/master'

This commit is contained in:
Latif Khalifa
2013-01-22 20:06:03 +01:00
32 changed files with 311 additions and 553 deletions

View File

@@ -7894,7 +7894,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>WebProfileURL</key>
<map>
<key>Comment</key>
<string>URL for SL Web Profiles</string>
<string>URL for Web Profiles</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -7902,17 +7902,6 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<string>https://my.secondlife.com/[AGENT_NAME]</string>
</map>
<key>WebProfileNonProductionURL</key>
<map>
<key>Comment</key>
<string>URL for SL Web Profiles on Non-Production grids</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>https://my-demo.secondlife.com/[AGENT_NAME]</string>
</map>
<key>HighResSnapshot</key>
<map>
<key>Comment</key>