diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-29 07:07:29 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-29 07:07:29 +0800 |
| commit | cb759bf9e0580b0c0799e33b8e7af1ea46a4c336 (patch) | |
| tree | 403de432ee5431fdb5195cb21d81b1c0a01cec54 /indra/llprimitive/llmodelloader.h | |
| parent | 2ec9d7fa779456112f36e963d1e169a71149662a (diff) | |
| parent | 288bce100d1239dd98e1d0730c905cc5cbe6ad1b (diff) | |
Merge tag 'Second_Life_Release#288bce10-2025.05' into 2025.05
Diffstat (limited to 'indra/llprimitive/llmodelloader.h')
| -rw-r--r-- | indra/llprimitive/llmodelloader.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h index 06a17f006e..335d809386 100644 --- a/indra/llprimitive/llmodelloader.h +++ b/indra/llprimitive/llmodelloader.h @@ -109,6 +109,7 @@ public: bool mTrySLM; bool mCacheOnlyHitIfRigged; // ignore cached SLM if it does not contain rig info (and we want rig info) + bool mTexturesNeedScaling; model_list mModelList; // The scene is pretty much what ends up getting loaded for upload. Basically assign things to this guy if you want something uploaded. @@ -170,9 +171,6 @@ public: void stretch_extents(const LLModel* model, const LLMatrix4& mat); - S32 mNumOfFetchingTextures ; // updated in the main thread - bool areTexturesReady() { return !mNumOfFetchingTextures; } // called in the main thread. - bool verifyCount( int expected, int result ); //Determines the viability of an asset to be used as an avatar rig (w or w/o joint upload caps) |