summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2015-10-01 09:02:45 -0700
committerGlenn Glazer <coyot@lindenlab.com>2015-10-01 09:02:45 -0700
commitd3928405e3498fabd9215da96fcd0d72e71e83e1 (patch)
tree218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/newview/app_settings/settings.xml
parentc1e3f778cb377999edf49764088f3f23a2302afc (diff)
parent6c422a881499c0d7649a59db47905a584bbd2bc1 (diff)
merge, close develop branch
--HG-- branch : develop
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 98d0ba53f6..6533344048 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10633,6 +10633,28 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>SkeletonFileName</key>
+ <map>
+ <key>Comment</key>
+ <string>Alternative skeleton file name</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>avatar_skeleton.xml</string>
+ </map>
+ <key>AvatarFileName</key>
+ <map>
+ <key>Comment</key>
+ <string>Alternative avatar file name</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>avatar_lad.xml</string>
+ </map>
<key>ShowAdvancedGraphicsSettings</key>
<map>
<key>Comment</key>