diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-01-15 17:01:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-01-15 17:01:16 -0500 |
| commit | 9848fc42534e48d20cf6d6732aae1c8233580792 (patch) | |
| tree | cdc30035e2b6ced3cf6d4f9df1844ea7dc4c2836 /indra/llprimitive/llmodelloader.cpp | |
| parent | 4b7ff25eba4b285e267ec6f766221ffcde82a808 (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
merge changes for 4.0.1-release
Diffstat (limited to 'indra/llprimitive/llmodelloader.cpp')
| -rw-r--r-- | indra/llprimitive/llmodelloader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp index 81d92d151b..f86eceb98d 100644 --- a/indra/llprimitive/llmodelloader.cpp +++ b/indra/llprimitive/llmodelloader.cpp @@ -116,6 +116,7 @@ LLModelLoader::LLModelLoader( , LLThread("Model Loader") , mFilename(filename) , mLod(lod) +, mTrySLM(false) , mFirstTransform(TRUE) , mNumOfFetchingTextures(0) , mLoadCallback(load_cb) @@ -123,6 +124,9 @@ LLModelLoader::LLModelLoader( , mTextureLoadFunc(texture_load_func) , mStateCallback(state_cb) , mOpaqueData(opaque_userdata) +, mRigParityWithScene(false) +, mRigValidJointUpload(false) +, mLegacyRigValid(false) , mNoNormalize(false) , mNoOptimize(false) , mCacheOnlyHitIfRigged(false) |