diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-04-03 14:43:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-04-03 14:43:49 -0700 |
| commit | 2de894bdc785c8d68dc4197b68aa9305450999f7 (patch) | |
| tree | ddeae08bcfd7f848c6d81e5058146e64108afbcd /indra/newview/app_settings | |
| parent | 17641c8427d05c4cde1fadd2ca059264d89bc818 (diff) | |
| parent | ab30a44d9de332466841bfb40aa494ff0db1089a (diff) | |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/logcontrol.xml | 1 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 15 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings_per_account.xml | 11 |
3 files changed, 27 insertions, 0 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 15cb5bc0eb..de3732f339 100755 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -43,6 +43,7 @@ <key>tags</key> <array> <!-- sample entry for debugging specific items + <string>Avatar</string> <string>Inventory</string> <string>SceneLoadTiming</string> <string>Avatar</string> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 94d3c8a59f..138bdde9e9 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -654,6 +654,21 @@ <key>Value</key> <integer>2</integer> </map> + <key>AvatarPosFinalOffset</key> + <map> + <key>Comment</key> + <string>After-everything-else fixup for avatar position.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Vector3</string> + <key>Value</key> + <array> + <real>0.0</real> + <real>0.0</real> + <real>0.0</real> + </array> + </map> <key>AvatarPickerURL</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index fc6f1f6395..d119504017 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -1,5 +1,16 @@ <llsd> <map> + <key>AvatarHoverOffsetZ</key> + <map> + <key>Comment</key> + <string>After-everything-else fixup for avatar Z position.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.0</real> + </map> <key>DoNotDisturbResponseChanged</key> <map> <key>Comment</key> |