diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-15 16:28:12 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-15 16:28:12 -0600 |
| commit | 47b9f588df1f90126aa630ed050e41b2d145a085 (patch) | |
| tree | 8aaba6284823715d93158912d7371105fee353b4 /indra/newview/llfloatermodelpreview.h | |
| parent | 8e532652ebe02d479271d7ec6f2b7c293e020afe (diff) | |
| parent | 0bb7bcc96cfea7b5d56f083d0afcbc1fce7e9f21 (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 8e7189e8c6..ccd6fef953 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) ;
|