Merge remote branch 'thickbrick/weekly' into weekly

4 files changed, 53 insertions, 11 deletions

diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.cpp b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
index b5817e5..4aa9d2a 100644
--- a/linden/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -50,6 +50,7 @@ const F32 MIN_WALK_SPEED = 0.1f;	// minimum speed at which we use velocity for d
 const F32 MAX_TIME_DELTA = 2.f;         //max two seconds a frame for calculating interpolation
 const F32 SPEED_ADJUST_MAX = 2.5f; // maximum adjustment of walk animation playback speed
 const F32 SPEED_ADJUST_MAX_SEC = 3.f;   // maximum adjustment to walk animation playback speed for a second
+const F32 SPEED_FINAL_SCALING = 0.5f;  // final scaling for walk animation
 const F32 DRIFT_COMP_MAX_TOTAL = 0.07f;//0.55f; // maximum drift compensation overall, in any direction 
 const F32 DRIFT_COMP_MAX_SPEED = 4.f; // speed at which drift compensation total maxes out
 const F32 MAX_ROLL = 0.6f;
@@ -314,6 +315,7 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
         }
 
         mAnimSpeed = (mAvgSpeed + mSpeedAdjust) * mRelativeDir;
+        mAnimSpeed = mAnimSpeed * SPEED_FINAL_SCALING;
 //      char debug_text[64];
 //      sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity);
 //      mCharacter->addDebugText(debug_text);
diff --git a/linden/indra/newview/llassetuploadresponders.h b/linden/indra/newview/llassetuploadresponders.h
index c08f299..9102f6b 100644
--- a/linden/indra/newview/llassetuploadresponders.h
+++ b/linden/indra/newview/llassetuploadresponders.h
@@ -74,6 +74,7 @@ public:
 class LLBakedUploadData;
 class LLSendTexLayerResponder : public LLAssetUploadResponder
 {
+        LOG_CLASS(LLSendTexLayerResponder);
 public:
         LLSendTexLayerResponder(const LLSD& post_data,
                                                         const LLUUID& vfile_id,
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 5175cbb..c8e1298 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -61,6 +61,8 @@
 
 using namespace LLVOAvatarDefines;
 
+const S32 MAX_BAKE_UPLOAD_ATTEMPTS = 4;
+
 // static
 S32 LLTexLayerSetBuffer::sGLByteCount = 0;
 
@@ -98,6 +100,8 @@ LLTexLayerSetBuffer::LLTexLayerSetBuffer(LLTexLayerSet* owner, S32 width, S32 he
         mNeedsUpdate( TRUE ),
         mNeedsUpload( FALSE ),
         mUploadPending( FALSE ), // Not used for any logic here, just to sync sending of updates
+        mUploadFailCount( 0 ),
+        mUploadAfter( 0 ),
         mTexLayerSet( owner )   
 {
         LLTexLayerSetBuffer::sGLByteCount += getSize();
@@ -151,6 +155,18 @@ void LLTexLayerSetBuffer::requestUpload()
         {
                 mNeedsUpload = TRUE;
                 mUploadPending = TRUE;
+                mUploadAfter = 0;
+        }
+}
+
+// request an upload to start delay_usec microseconds from now
+void LLTexLayerSetBuffer::requestDelayedUpload(U64 delay_usec)
+{
+        if (!mNeedsUpload)
+        {
+                mNeedsUpload = TRUE;
+                mUploadPending = TRUE;
+                mUploadAfter = LLFrameTimer::getTotalTime() + delay_usec;
         }
 }
 
@@ -161,6 +177,14 @@ void LLTexLayerSetBuffer::cancelUpload()
                 mNeedsUpload = FALSE;
         }
         mUploadPending = FALSE;
+        mUploadAfter = 0;
+}
+
+// do we need to upload, and do we have sufficient data to create an uploadable composite?
+BOOL LLTexLayerSetBuffer::needsUploadNow() const
+{
+        BOOL upload = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal() && (gAgent.mNumPendingQueries == 0);
+        return (upload && (LLFrameTimer::getTotalTime() > mUploadAfter));
 }
 
 void LLTexLayerSetBuffer::pushProjection()
@@ -187,7 +211,7 @@ void LLTexLayerSetBuffer::popProjection()
 BOOL LLTexLayerSetBuffer::needsRender()
 {
         LLVOAvatar* avatar = mTexLayerSet->getAvatar();
-        BOOL upload_now = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal() && gAgent.mNumPendingQueries == 0;
+        BOOL upload_now = needsUploadNow();
         BOOL needs_update = (mNeedsUpdate || upload_now) && !avatar->mAppearanceAnimating;
         if (needs_update)
         {
@@ -229,9 +253,6 @@ BOOL LLTexLayerSetBuffer::render()
         // Default color mask for tex layer render
         gGL.setColorMask(true, true);
 
-        // do we need to upload, and do we have sufficient data to create an uploadable composite?
-        // When do we upload the texture if gAgent.mNumPendingQueries is non-zero?
-        BOOL upload_now = (gAgent.mNumPendingQueries == 0 && mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal());
         BOOL success = TRUE;
 
         // Composite the color data
@@ -239,7 +260,7 @@ BOOL LLTexLayerSetBuffer::render()
         success &= mTexLayerSet->render( mOrigin.mX, mOrigin.mY, mWidth, mHeight );
         gGL.flush();
 
-        if( upload_now )
+        if( needsUploadNow() )
         {
                 if (!success)
                 {
@@ -387,7 +408,8 @@ void LLTexLayerSetBuffer::readBackAndUpload()
                                 std::string url = gAgent.getRegion()->getCapability("UploadBakedTexture");
 
                                 if(!url.empty()
-                                        && !LLPipeline::sForceOldBakedUpload) // Toggle the debug setting UploadBakedTexOld to change between the new caps method and old method
+                                        && !LLPipeline::sForceOldBakedUpload // Toggle the debug setting UploadBakedTexOld to change between the new caps method and old method
+                                        && (mUploadFailCount < MAX_BAKE_UPLOAD_ATTEMPTS-1)) // allow last ditch attempt via asset store, since capabilty seems prone to transient failures.
                                 {
                                         llinfos << "Baked texture upload via capability of " << mUploadID << " to " << url << llendl;
 
@@ -436,12 +458,14 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* user
 
         LLVOAvatar* avatar = gAgent.getAvatarObject();
 
-        if (0 == result &&
-                avatar && !avatar->isDead() &&
+        if (avatar && !avatar->isDead() &&
+                baked_upload_data &&
                 baked_upload_data->mAvatar == avatar && // Sanity check: only the user's avatar should be uploading textures.
                 baked_upload_data->mLayerSet->hasComposite())
         {
                 LLTexLayerSetBuffer* layerset_buffer = baked_upload_data->mLayerSet->getComposite();
+                S32 failures = layerset_buffer->mUploadFailCount;
+                layerset_buffer->mUploadFailCount = 0;
 
                 if (layerset_buffer->mUploadID.isNull())
                 {
@@ -469,9 +493,20 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* user
                         }
                         else
                         {       
-                                // Avatar appearance is changing, ignore the upload results
-                                llinfos << "Baked upload failed. Reason: " << result << llendl;
-                                // *FIX: retry upload after n seconds, asset server could be busy
+                                ++failures;
+                                llinfos << "Baked upload failed (attempt " << failures << "/" << MAX_BAKE_UPLOAD_ATTEMPTS << "), ";
+                                if (failures >= MAX_BAKE_UPLOAD_ATTEMPTS)
+                                {
+                                        llcont << "giving up.";
+                                }
+                                else
+                                {
+                                        const F32 delay = 5.f;
+                                        llcont << llformat("retrying in %.2f seconds.", delay);
+                                        layerset_buffer->mUploadFailCount = failures;
+                                        layerset_buffer->requestDelayedUpload((U64)(delay * 1000000));
+                                }
+                                llcont << llendl;
                         }
                 }
                 else
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:
         BOOL                                    needsRender();
         void                                    requestUpdate();
         void                                    requestUpload();
+        void                                    requestDelayedUpload(U64 delay_usec);
         void                                    cancelUpload();
         BOOL                                    uploadPending() { return mUploadPending; }
         BOOL                                    render( S32 x, S32 y, S32 width, S32 height );
@@ -234,12 +235,15 @@ public:
 private:
         void                                    pushProjection();
         void                                    popProjection();
+        BOOL                                    needsUploadNow() const;
 
 private:
         BOOL                                    mNeedsUpdate;
         BOOL                                    mNeedsUpload;
         BOOL                                    mUploadPending;
         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)
+        S32                                             mUploadFailCount;
+        U64                                             mUploadAfter;   // delay upload until after this time (in microseconds)
         LLTexLayerSet*                  mTexLayerSet;
 
         static S32                              sGLByteCount;