summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2015-10-08 15:18:48 -0700
committerAura Linden <aura@lindenlab.com>2015-10-08 15:18:48 -0700
commitb082ed28e8936fa378160be3076393f295c26c1b (patch)
tree6dfd40478bbcf0a03e4be12d3d17c73ad161d7d2 /indra/newview/app_settings/settings.xml
parentd038ed07f0978aa9f43e488bd525987d20543d1c (diff)
parent5b58bfb937f7f996c7f1b97f15b1c837aa23a463 (diff)
Pulled merge from Vir's Bento.
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6533344048..dcb2764fe7 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6112,6 +6112,17 @@
<key>Value</key>
<real>1.6</real>
</map>
+ <key>MaxJointsPerMeshObject</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum joints per rigged mesh object</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <real>999</real>
+ </map>
<key>MaxPersistentNotifications</key>
<map>
<key>Comment</key>