diff options
| author | Thickbrick Sleaford <thickbrick.sleaford@gmail.com> | 2011-06-15 21:19:12 +0300 |
|---|---|---|
| committer | Thickbrick Sleaford <thickbrick.sleaford@gmail.com> | 2011-06-15 21:19:12 +0300 |
| commit | 1a44e5b3e93c80bc09ae5ea0a3f600658d51324e (patch) | |
| tree | 27d7183a44ac53daa0ef0591324d91be5f9129bc /indra/newview/lltexlayer.h | |
| parent | 735c0dbc5ff731aad95227a940ef8b09a4a9e77d (diff) | |
FIX STORM-1325 Retry bake uploads in case of upload failure
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 |