diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-03-08 13:32:28 -0800 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-03-08 13:32:28 -0800 |
| commit | ec683bb9cf6688633d8bc7ecbdf72f7cbc14d349 (patch) | |
| tree | 59ada405958cd7764a96cfa35ccc89e83706b5af /indra/llprimitive/llmodelloader.cpp | |
| parent | daf8b882a12cf903d180f6303065d7b83f7a1958 (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
pull from trunk
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) |