diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-10-22 12:11:50 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-10-22 12:11:50 +0300 |
| commit | 74cf2c804eb413237529666a992c85dd3d61a0ca (patch) | |
| tree | 25e29ac7edabdb8c307ab535f92ac8312158779d /indra | |
| parent | 54968b2470f0ca80d8edc329236b1c6164a3e2f9 (diff) | |
MAINT-4487 FIXED [loader mods] triangle limits from .slm are ignored when uploading the model the second time.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llprimitive/llmodelloader.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp index cb3d482d14..677e4fcb37 100644 --- a/indra/llprimitive/llmodelloader.cpp +++ b/indra/llprimitive/llmodelloader.cpp @@ -125,6 +125,7 @@ LLModelLoader::LLModelLoader( , mOpaqueData(opaque_userdata) , mNoNormalize(false) , mNoOptimize(false) +, mCacheOnlyHitIfRigged(false) { mJointMap["mPelvis"] = "mPelvis"; mJointMap["mTorso"] = "mTorso"; diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 9d372766a8..1e1e96acef 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1733,7 +1733,12 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable { mModelLoader->mTrySLM = false; } - + else + { + //only try to load from slm if viewer is configured to do so and this is the + //initial model load (not an LoD or physics shape) + mModelLoader->mTrySLM = gSavedSettings.getBOOL("MeshImportUseSLM") && mUploadData.empty(); + } mModelLoader->start(); mFMP->childSetTextArg("status", "[STATUS]", mFMP->getString("status_reading_file")); |