1 files changed, 19 insertions, 10 deletions

diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 5cb65b6..58d57b5 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -639,10 +639,10 @@ BOOL LLViewerObject::setDrawableParent(LLDrawable* parentp)
 }
 
 U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
-                                                                                  void **user_data,
-                                                                                  U32 block_num,
-                                                                                  const EObjectUpdateType update_type,
-                                                                                  LLDataPacker *dp)
+                                         void **user_data,
+                                         U32 block_num,
+                                         const EObjectUpdateType update_type,
+                                         LLDataPacker *dp)
 {
         LLMemType mt(LLMemType::MTYPE_OBJECT);
         
@@ -658,6 +658,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                 from_region_handle(region_handle, &x, &y);
 
                 llerrs << "Object has invalid region " << x << ":" << y << "!" << llendl;
+                return retval;
         }
 
         U16 time_dilation16;
@@ -934,7 +935,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
                                 // Check for appended generic data
                                 S32 data_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_Data);
-                                if (data_size == 0)
+                                if (data_size <= 0)
                                 {
                                         mData = NULL;
                                 }
@@ -1757,9 +1758,16 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
         if (gPingInterpolate)
         { 
                 LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(mesgsys->getSender());
-                F32 ping_delay = 0.5f * mTimeDilation * ( ((F32)cdp->getPingDelay()) * 0.001f + gFrameDTClamped);
-                LLVector3 diff = getVelocity() * (0.5f*mTimeDilation*(gFrameDTClamped + ((F32)ping_delay)*0.001f)); 
-                new_pos_parent += diff;
+                if (cdp)
+                {
+                        F32 ping_delay = 0.5f * mTimeDilation * ( ((F32)cdp->getPingDelay()) * 0.001f + gFrameDTClamped);
+                        LLVector3 diff = getVelocity() * (0.5f*mTimeDilation*(gFrameDTClamped + ((F32)ping_delay)*0.001f)); 
+                        new_pos_parent += diff;
+                }
+                else
+                {
+                        llwarns << "findCircuit() returned NULL; skipping interpolation" << llendl;
+                }
         }
 
         //////////////////////////
@@ -4134,7 +4142,7 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
         {
                 return;
         }
-
+        
         if (audio_uuid.isNull())
         {
                 if (mAudioSourcep && mAudioSourcep->isLoop() && !mAudioSourcep->hasPendingPreloads())
@@ -4169,7 +4177,8 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
                 }
         }
 
-        if ( mAudioSourcep )
+                // don't clean up before previous sound is done. Solves: SL-33486
+        if ( mAudioSourcep && mAudioSourcep->isDone() ) 
         {
                 gAudiop->cleanupAudioSource(mAudioSourcep);
                 mAudioSourcep = NULL;