diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-02-17 19:34:52 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-02-17 19:34:52 +0200 |
| commit | 50f9e4b308b83a9751d2837e09445c944bdc2a85 (patch) | |
| tree | c29edfc2f6fc32838a4af0aa9a75b807dcf105b2 /indra/newview | |
| parent | 200f7dedf258ec7cbbe2266fce6a189386df7249 (diff) | |
| parent | 8920beabc4b01dfdbd8eb3bbe33deefe03896f7d (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2f396d20a0..0ac2dcc86c 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> diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 29bbf7d01e..2255e10678 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1766,7 +1766,8 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable this, mJointTransformMap, mJointsFromNode, - gSavedSettings.getU32("ImporterModelLimit")); + gSavedSettings.getU32("ImporterModelLimit"), + gSavedSettings.getBOOL("ImporterPreprocessDAE")); if (force_disable_slm) { |