diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-11 16:49:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-11 16:49:29 -0400 |
| commit | 7b9fc42941c7531cdbf97bcefcdd03ccd5734679 (patch) | |
| tree | 9eac396ffa20d9210a31900f0b501d098b9eaddb /indra/newview/lltexlayer.h | |
| parent | c94bc42892610c905942c73d960e9d186da640e5 (diff) | |
| parent | 1f15f91d18a37fda5b13ca329aac39d8f01e7790 (diff) | |
merge changes for storm-1325
Diffstat (limited to 'indra/newview/lltexlayer.h')
| -rw-r--r-- | indra/newview/lltexlayer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h index 2d710d2dce..85dadb213c 100644 --- a/indra/newview/lltexlayer.h +++ b/indra/newview/lltexlayer.h @@ -312,6 +312,8 @@ private: BOOL mUploadPending; // Whether we have received back the new baked textures LLUUID mUploadID; // The current upload process (null if none). LLFrameTimer mNeedsUploadTimer; // Tracks time since upload was requested and performed. + S32 mUploadFailCount; // Number of consecutive upload failures + LLFrameTimer mUploadRetryTimer; // Tracks time since last upload failure. //-------------------------------------------------------------------- // Updates @@ -363,12 +365,14 @@ struct LLBakedUploadData { LLBakedUploadData(const LLVOAvatarSelf* avatar, LLTexLayerSet* layerset, - const LLUUID& id); + const LLUUID& id, + bool highest_res); ~LLBakedUploadData() {} const LLUUID mID; const LLVOAvatarSelf* mAvatar; // note: backlink only; don't LLPointer LLTexLayerSet* mTexLayerSet; const U64 mStartTime; // for measuring baked texture upload time + const bool mIsHighestRes; // whether this is a "final" bake, or intermediate low res }; #endif // LL_LLTEXLAYER_H |