fix for SH-1788: Assert in texture load when uploading textured mesh model

and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index a328bfb4dd..dcc2fc8898 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -132,6 +132,9 @@ public:
 	JointTransformMap& mJointList;	

 	std::deque<std::string>& mJointsFromNode;

 

+	S32 mNumOfFetchingTextures ; //updated in the main thread

+	bool areTexturesReady() { return !mNumOfFetchingTextures; } //called in the main thread.

+

 private:

 	static std::list<LLModelLoader*> sActiveLoaderList;

 	static bool isAlive(LLModelLoader* loader) ;