diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-10-18 19:33:07 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-10-18 19:33:07 +0800 |
commit | d353111de315f9d37bf914b54a52d217c45a6e19 (patch) | |
tree | 6e5cd425872de97080fc1759f981219b0c2d927a /indra/llprimitive/llmodelloader.h | |
parent | ad3cbb9f75c4ea7f0473225afc034c403b54fc82 (diff) | |
parent | bd19bbf651d5a2b83e367d1f50a3d8eb00d5fbbd (diff) |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llprimitive/llmodelloader.h')
-rw-r--r-- | indra/llprimitive/llmodelloader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h index 637dabe08a..530e61e2b8 100644 --- a/indra/llprimitive/llmodelloader.h +++ b/indra/llprimitive/llmodelloader.h @@ -156,12 +156,12 @@ public: bool loadFromSLM(const std::string& filename); void loadModelCallback(); - void loadTextures(); // called in the main thread. + void loadTextures() ; // called in the main thread. void setLoadState(U32 state); void stretch_extents(const LLModel* model, const LLMatrix4& mat); - S32 mNumOfFetchingTextures; // updated in the main thread + S32 mNumOfFetchingTextures ; // updated in the main thread bool areTexturesReady() { return !mNumOfFetchingTextures; } // called in the main thread. bool verifyCount( int expected, int result ); |