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/newview/llmodelpreview.h | |
| parent | 2ec9d7fa779456112f36e963d1e169a71149662a (diff) | |
| parent | 288bce100d1239dd98e1d0730c905cc5cbe6ad1b (diff) | |
Merge tag 'Second_Life_Release#288bce10-2025.05' into 2025.05
Diffstat (limited to 'indra/newview/llmodelpreview.h')
| -rw-r--r-- | indra/newview/llmodelpreview.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h index 0873263587..7b3b699b33 100644 --- a/indra/newview/llmodelpreview.h +++ b/indra/newview/llmodelpreview.h @@ -204,6 +204,7 @@ public: std::vector<S32> mLodsQuery; std::vector<S32> mLodsWithParsingError; bool mHasDegenerate; + bool areTexturesReady() { return !mNumOfFetchingTextures; } protected: @@ -213,6 +214,7 @@ protected: static LLJoint* lookupJointByName(const std::string&, void* opaque); static U32 loadTextures(LLImportMaterial& material, LLHandle<LLModelPreview> handle); + void warnTextureScaling(); void lookupLODModelFiles(S32 lod); private: @@ -242,6 +244,9 @@ private: /// Not read unless mWarnOfUnmatchedPhyicsMeshes is true. LLPointer<LLModel> mDefaultPhysicsShapeP; + S32 mNumOfFetchingTextures; + bool mTexturesNeedScaling; + typedef enum { MESH_OPTIMIZER_FULL, |