summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-03-17 13:14:21 -0700
committerRider Linden <rider@lindenlab.com>2016-03-17 13:14:21 -0700
commitb8c1976460374e743743728ef49b38ad52c453a4 (patch)
tree4f340d954ae3552d4dbb87b389d15d98d66eba51 /indra/newview/app_settings
parent7a0fb4fece5a92627caa08622e9584a903a3fa1d (diff)
parent4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff)
Merge
Diffstat (limited to 'indra/newview/app_settings')
-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 d5549013fa..c4a8fe3532 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -35,6 +35,17 @@
<key>Value</key>
<integer>768</integer>
</map>
+ <key>ImporterPreprocessDAE</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable preprocessing for DAE files to fix some ColladaDOM related problems (like support for space characters within names and ids).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>IMShowTime</key>
<map>
<key>Comment</key>