diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-01 11:39:36 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-01 11:39:36 -0700 |
| commit | 919aac86765f60a39d318928c144f7751e62b420 (patch) | |
| tree | 85933be6e85062058c40d4359258042c866d19b8 /indra/newview/llvoavatar.h | |
| parent | f1eac16260fccce643f499c1b5591f3130003d10 (diff) | |
| parent | a9f2f874c8292b79ac66ff6ceb3bd2daede1b736 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 4259bb8e73..3dad919875 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -263,6 +263,8 @@ private: S32 mFullyLoadedFrameCounter; LLFrameTimer mFullyLoadedTimer; LLFrameTimer mRuthTimer; +protected: + LLFrameTimer mInvisibleTimer; /** State ** ** @@ -499,7 +501,8 @@ protected: }; typedef std::vector<BakedTextureData> bakedtexturedata_vec_t; bakedtexturedata_vec_t mBakedTextureDatas; - + LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ; + BOOL mLoadedCallbacksPaused; //-------------------------------------------------------------------- // Local Textures //-------------------------------------------------------------------- @@ -519,7 +522,7 @@ private: virtual const LLTextureEntry* getTexEntry(const U8 te_num) const; virtual void setTexEntry(const U8 index, const LLTextureEntry &te); - + void checkTextureLoading() ; //-------------------------------------------------------------------- // Layers //-------------------------------------------------------------------- |