diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-08-12 01:12:27 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-12 01:12:27 +0000 |
commit | 0bf4b5f2222ffb8171be094613363427f3b8470a (patch) | |
tree | 4b742d6815f44a85c98113e9c5a3017eafc5968d /indra/newview/app_settings | |
parent | 8d7e56f219d0915e2c4a19baf2809dbc6ede7fa5 (diff) |
merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 107 |
1 files changed, 100 insertions, 7 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fa6ce4f1d8..f42ce2136f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1193,10 +1193,10 @@ <real>6.0</real> </array> </map> - <key>CameraOffsetDefault</key> + <key>CameraOffsetRearView</key> <map> <key>Comment</key> - <string>Default camera offset from avatar</string> + <string>Initial camera offset from avatar in Rear View</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -1208,6 +1208,36 @@ <real>0.75</real> </array> </map> + <key>CameraOffsetFrontView</key> + <map> + <key>Comment</key> + <string>Initial camera offset from avatar in Front View</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Vector3</string> + <key>Value</key> + <array> + <real>2.2</real> + <real>0.0</real> + <real>0.0</real> + </array> + </map> + <key>CameraOffsetGroupView</key> + <map> + <key>Comment</key> + <string>Initial camera offset from avatar in Group View</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Vector3</string> + <key>Value</key> + <array> + <real>-1.0</real> + <real>0.7</real> + <real>0.5</real> + </array> + </map> <key>CameraOffsetScale</key> <map> <key>Comment</key> @@ -1245,6 +1275,17 @@ <key>Value</key> <real>1.0</real> </map> + <key>CameraPreset</key> + <map> + <key>Comment</key> + <string>Preset camera position - view (0 - rear, 1 - front, 2 - group)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ChatBarStealsFocus</key> <map> <key>Comment</key> @@ -3134,14 +3175,14 @@ <key>Value</key> <integer>0</integer> </map> - <key>FocusOffsetDefault</key> + <key>FocusOffsetRearView</key> <map> <key>Comment</key> - <string>Default focus point offset relative to avatar (x-axis is forward)</string> + <string>Initial focus point offset relative to avatar for the camera preset Rear View (x-axis is forward)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>Vector3</string> + <string>Vector3D</string> <key>Value</key> <array> <real>1.0</real> @@ -3149,6 +3190,36 @@ <real>1.0</real> </array> </map> + <key>FocusOffsetFrontView</key> + <map> + <key>Comment</key> + <string>Initial focus point offset relative to avatar for the camera preset Front View</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Vector3D</string> + <key>Value</key> + <array> + <real>0.0</real> + <real>0.0</real> + <real>0.0</real> + </array> + </map> + <key>FocusOffsetGroupView</key> + <map> + <key>Comment</key> + <string>Initial focus point offset relative to avatar for the camera preset Group View</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Vector3D</string> + <key>Value</key> + <array> + <real>1.5</real> + <real>0.5</real> + <real>1.0</real> + </array> + </map> <key>FocusPosOnLogout</key> <map> <key>Comment</key> @@ -4593,7 +4664,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>20</integer> + <integer>130</integer> </map> <key>NextOwnerCopy</key> <map> @@ -6827,8 +6898,30 @@ <string>Boolean</string> <key>Value</key> <integer>0</integer> + </map> + <key>ShowPGSearchAll</key> + <map> + <key>Comment</key> + <string>Show/Hide Navigation Bar Favorites Panel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>ShowNavbarFavoritesPanel</key> + <map> + <key>Comment</key> + <string>Show/Hide Navigation Bar Navigation Panel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> </map> - <key>ShowPGSearchAll</key> + <key>ShowNavbarNavigationPanel</key> <map> <key>Comment</key> <string>Display results of search All that are flagged as PG</string> |