diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-03-23 14:34:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-03-23 14:34:31 -0400 |
| commit | 8e21b24a079684304b02485d8f28e9be8f16e6a0 (patch) | |
| tree | 3a68b52d0f0557d89ae3c6b04d63dd55032cba55 /indra/newview/app_settings/settings.xml | |
| parent | d3477b738881acbdf2bd1cc7bfaadaaae3890be6 (diff) | |
| parent | c489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff) | |
merge changes for 3.7.26-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 15 insertions, 0 deletions
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> |