diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/foldertypes.xml | 16 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 107 |
2 files changed, 116 insertions, 7 deletions
diff --git a/indra/newview/app_settings/foldertypes.xml b/indra/newview/app_settings/foldertypes.xml index 4d4d479bdd..698158308e 100644 --- a/indra/newview/app_settings/foldertypes.xml +++ b/indra/newview/app_settings/foldertypes.xml @@ -9,50 +9,66 @@ asset_num="27" xui_name="head" icon_name="inv_folder_outfit_head.tga" + allowed="hair,eyes" /> <ensemble asset_num="28" xui_name="gloves" icon_name="inv_folder_outfit_gloves.tga" + allowed="gloves" /> <ensemble asset_num="29" xui_name="jacket" icon_name="inv_folder_outfit_jacket.tga" + allowed="jacket" /> <ensemble asset_num="30" xui_name="pants" icon_name="inv_folder_outfit_pants.tga" + allowed="pants,underpants" /> <ensemble asset_num="31" xui_name="shape" icon_name="inv_folder_outfit_shape.tga" + allowed="shape,skin,hair,eyes" /> <ensemble asset_num="32" xui_name="shoes" icon_name="inv_folder_outfit_shoes.tga" + allowed="shoes,socks" /> <ensemble asset_num="33" xui_name="shirt" icon_name="inv_folder_outfit_shirt.tga" + allowed="shirt,undershirt" /> <ensemble asset_num="34" xui_name="skirt" icon_name="inv_folder_outfit_skirt.tga" + allowed="" /> <ensemble asset_num="35" xui_name="underpants" icon_name="inv_folder_outfit_underpants.tga" + allowed="underpants" /> <ensemble asset_num="36" xui_name="undershirt" icon_name="inv_folder_outfit_undershirt.tga" + allowed="undershirt" + /> + <ensemble + asset_num="47" + xui_name="outfit" + icon_name="inv_folder_outfit.tga" + allowed="outfit" /> </ensemble_defs> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1432365d38..702839869a 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> @@ -6838,8 +6909,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> |