diff options
| author | Richard Linden <none@none> | 2011-03-01 17:16:37 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-01 17:16:37 -0800 |
| commit | 7ffd09a697a132b6b1478e74e5729167408a1f6a (patch) | |
| tree | 2f0d8cef2f91f1c17bb7d495cbc8d415ce96a72f /indra/newview/app_settings | |
| parent | 876ac01791104afa9122ea0d3f6a914b5a86fd72 (diff) | |
| parent | afe9557ea922a382497f99f6341a13ce9d9b9228 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 15 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 6 |
2 files changed, 16 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b71b9d06ff..6d988e16e4 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/avatars.html</string> + <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/[GRID]/avatars.html</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/guide.html</string> + <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/[GRID]/guide.html</string> </map> <key>DisableCameraConstraints</key> <map> @@ -2810,6 +2810,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>DoubleClickShowWorldMap</key> + <map> + <key>Comment</key> + <string>Enable double-click to show world map from mini map</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>DragAndDropToolTipDelay</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 52a0d1221b..cd0fe9e892 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -259,16 +259,16 @@ <key>Value</key> <integer>0</integer> </map> - <key>DoubleClickTeleport</key> + <key>DoubleClickShowWorldMap</key> <map> <key>Comment</key> - <string>Enable double-click to teleport where allowed</string> + <string>Enable double-click to show world map from mini map</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> </map> </llsd> |