summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2015-03-23 12:43:44 -0700
committerMerov Linden <merov@lindenlab.com>2015-03-23 12:43:44 -0700
commit760941d504d1dc6d423b7246a0ea1d1d73aed4a5 (patch)
treeff88cd57bb03cf38fb7fef121647b1951ede1aaa /indra/newview/app_settings/settings.xml
parentbdb9a769f12754dadf324b3dd395c1ca1519f938 (diff)
parentc489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff)
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 731f64e70e..d8565aec2f 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>