diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-06 14:17:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-06 14:17:18 +0300 |
| commit | acc8928330fe1e5022a1e968afe7d7027b86a63a (patch) | |
| tree | b95453ecc772cb4eaf275aab6fb5a882087a4c33 /indra/newview/llmodelpreview.h | |
| parent | c25df5224f7bf150ddc56014b0389985da2eb542 (diff) | |
| parent | f338b91f7c9dbfe999b5ea9a1facb9eaeafb3407 (diff) | |
Merge release/2025.05 into develop
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, |