diff options
author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-08-08 18:32:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-08-08 18:32:24 -0400 |
commit | 28678996ceaea019aafaa26911a440769320c498 (patch) | |
tree | 1c5461d5b432b2b6114faee0ebfb1bb2d2f5095a /indra/newview/llmodelpreview.h | |
parent | a6feb3dc7f3b1985bcc6a16330b368917cff25f8 (diff) | |
parent | f338b91f7c9dbfe999b5ea9a1facb9eaeafb3407 (diff) |
Merge pull request #4382 from secondlife/release/2025.05
Release/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, |