diff options
| author | leyla <leyla@leyla.com> | 2011-03-14 11:28:13 -0700 |
|---|---|---|
| committer | leyla <leyla@leyla.com> | 2011-03-14 11:28:13 -0700 |
| commit | c762beed267115b7670e01219ccff4fc64bdca4c (patch) | |
| tree | 8ee42a8defd3bae58759a9dd3517385d830c52b8 /indra/newview/app_settings/settings.xml | |
| parent | bc2aca863f5d27f551e48a2de8f879360a3a96ab (diff) | |
| parent | 405a748746c8ea040fe0efeda54e58f378289795 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 59 |
1 files changed, 57 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 42fd9929ae..058ececc6b 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> @@ -3899,6 +3899,17 @@ <key>Value</key> <string>https://my.secondlife.com/[AGENT_NAME]</string> </map> + <key>WebProfileNonProductionURL</key> + <map> + <key>Comment</key> + <string>URL for 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> @@ -8462,6 +8473,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>RenderVBOMappingDisable</key> + <map> + <key>Comment</key> + <string>Disable VBO glMapBufferARB</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RenderUseStreamVBO</key> <map> <key>Comment</key> @@ -12520,5 +12542,38 @@ <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> + <key>ClickToWalk</key> + <map> + <key>Comment</key> + <string>Click in world to walk to location</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |