aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexlayer.h
diff options
context:
space:
mode:
authorthickbrick2010-10-30 19:44:04 +0200
committerthickbrick2010-10-30 19:44:04 +0200
commit34a5639792b97b3dc33ee2dfd1b15ee907c4634f (patch)
tree3ec14fa4d6c4781f17816d70d01f0e325c1cc9c8 /linden/indra/newview/lltexlayer.h
parentFix Bug #671 (aka VWR-1603): Duckwalk is too fast (diff)
downloadmeta-impy-34a5639792b97b3dc33ee2dfd1b15ee907c4634f.zip
meta-impy-34a5639792b97b3dc33ee2dfd1b15ee907c4634f.tar.gz
meta-impy-34a5639792b97b3dc33ee2dfd1b15ee907c4634f.tar.bz2
meta-impy-34a5639792b97b3dc33ee2dfd1b15ee907c4634f.tar.xz
Fix bug #672: Failed bake uploads don't retry
Add a retry counter and a small delay for retyring failed bake uploads. This is one possible cause of outfit changes (and un-ruthing) not propagating from the viewer to the sim until the user manually rebakes.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lltexlayer.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index 020ba86..31b175e 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -218,6 +218,7 @@ public:
218 BOOL needsRender(); 218 BOOL needsRender();
219 void requestUpdate(); 219 void requestUpdate();
220 void requestUpload(); 220 void requestUpload();
221 void requestDelayedUpload(U64 delay_usec);
221 void cancelUpload(); 222 void cancelUpload();
222 BOOL uploadPending() { return mUploadPending; } 223 BOOL uploadPending() { return mUploadPending; }
223 BOOL render( S32 x, S32 y, S32 width, S32 height ); 224 BOOL render( S32 x, S32 y, S32 width, S32 height );
@@ -234,12 +235,15 @@ public:
234private: 235private:
235 void pushProjection(); 236 void pushProjection();
236 void popProjection(); 237 void popProjection();
238 BOOL needsUploadNow() const;
237 239
238private: 240private:
239 BOOL mNeedsUpdate; 241 BOOL mNeedsUpdate;
240 BOOL mNeedsUpload; 242 BOOL mNeedsUpload;
241 BOOL mUploadPending; 243 BOOL mUploadPending;
242 LLUUID mUploadID; // Identifys the current upload process (null if none). Used to avoid overlaps (eg, when the user rapidly makes two changes outside of Face Edit) 244 LLUUID mUploadID; // Identifys the current upload process (null if none). Used to avoid overlaps (eg, when the user rapidly makes two changes outside of Face Edit)
245 S32 mUploadFailCount;
246 U64 mUploadAfter; // delay upload until after this time (in microseconds)
243 LLTexLayerSet* mTexLayerSet; 247 LLTexLayerSet* mTexLayerSet;
244 248
245 static S32 sGLByteCount; 249 static S32 sGLByteCount;