Second Life viewer sources 1.19.1.0

1 files changed, 75 insertions, 40 deletions

diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 50ab57c..056475b 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -86,7 +86,6 @@
 #include "llvolumemessage.h"
 #include "llvopartgroup.h"
 #include "llvosky.h"
-#include "llvostars.h"
 #include "llvosurfacepatch.h"
 #include "llvotextbubble.h"
 #include "llvotree.h"
@@ -96,6 +95,7 @@
 #include "llui.h"
 #include "pipeline.h"
 #include "llappviewer.h"
+#include "llvowlsky.h"
 
 //#define DEBUG_UPDATE_TYPE
 
@@ -143,14 +143,14 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
           res = new LLVOSurfacePatch(id, pcode, regionp); break;
         case LL_VO_SKY:
           res = new LLVOSky(id, pcode, regionp); break;
-        case LL_VO_STARS:
-          res = new LLVOStars(id, pcode, regionp); break;
         case LL_VO_WATER:
           res = new LLVOWater(id, pcode, regionp); break;
         case LL_VO_GROUND:
           res = new LLVOGround(id, pcode, regionp); break;
         case LL_VO_PART_GROUP:
           res = new LLVOPartGroup(id, pcode, regionp); break;
+        case LL_VO_WL_SKY:
+          res = new LLVOWLSky(id, pcode, regionp); break;
         default:
           llwarns << "Unknown object pcode " << (S32)pcode << llendl;
           res = NULL; break;
@@ -193,7 +193,6 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
         mOnMap(FALSE),
         mStatic(FALSE),
         mNumFaces(0),
-        mLastUpdateFrame(0),
         mTimeDilation(1.f),
         mRotTime(0.f),
         mJointInfo(NULL),
@@ -631,17 +630,19 @@ BOOL LLViewerObject::setDrawableParent(LLDrawable* parentp)
         
         BOOL ret = mDrawable->mXform.setParent(parentp ? &parentp->mXform : NULL);
         gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-        if (old_parent || (parentp && parentp->isActive()))
+        if(     old_parent != parentp &&
+                old_parent || (parentp && parentp->isActive()))
         {
+                // *TODO we should not be relying on setDrawable parent to call markMoved
                 gPipeline.markMoved(mDrawable, FALSE);
         }
-        else
+        else if (!mDrawable->isAvatar())
         {
                 mDrawable->updateXform(TRUE);
-                if (!mDrawable->getSpatialGroup())
+                /*if (!mDrawable->getSpatialGroup())
                 {
                         mDrawable->movePartition();
-                }
+                }*/
         }
         
         return ret;
@@ -677,7 +678,6 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                          LLDataPacker *dp)
 {
         LLMemType mt(LLMemType::MTYPE_OBJECT);
-        
         U32 retval = 0x0;
         
         // Coordinates of objects on simulators are region-local.
@@ -2292,7 +2292,7 @@ void LLViewerObject::dirtyInventory()
         // If there aren't any LLVOInventoryListeners, we won't be
         // able to update our mInventory when it comes back from the
         // simulator, so we should not clear the inventory either.
-        if(mInventory && !mInventoryCallbacks.isEmpty())
+        if(mInventory && !mInventoryCallbacks.empty())
         {
                 mInventory->clear(); // will deref and delete entries
                 delete mInventory;
@@ -2308,20 +2308,22 @@ void LLViewerObject::registerInventoryListener(LLVOInventoryListener* listener,
         LLInventoryCallbackInfo* info = new LLInventoryCallbackInfo;
         info->mListener = listener;
         info->mInventoryData = user_data;
-        mInventoryCallbacks.addData(info);
+        mInventoryCallbacks.push_front(info);
 }
 
 void LLViewerObject::removeInventoryListener(LLVOInventoryListener* listener)
 {
-        if (listener == NULL) return;
-        LLInventoryCallbackInfo* info;
-        for (info = mInventoryCallbacks.getFirstData();
-                info;
-                info = mInventoryCallbacks.getNextData() )
+        if (listener == NULL)
+                return;
+        for (callback_list_t::iterator iter = mInventoryCallbacks.begin();
+                 iter != mInventoryCallbacks.end(); )
         {
+                callback_list_t::iterator curiter = iter++;
+                LLInventoryCallbackInfo* info = *curiter;
                 if (info->mListener == listener)
                 {
-                        mInventoryCallbacks.deleteCurrentData();
+                        delete info;
+                        mInventoryCallbacks.erase(curiter);
                         break;
                 }
         }
@@ -2329,7 +2331,8 @@ void LLViewerObject::removeInventoryListener(LLVOInventoryListener* listener)
 
 void LLViewerObject::clearInventoryListeners()
 {
-        mInventoryCallbacks.deleteAllData();
+        for_each(mInventoryCallbacks.begin(), mInventoryCallbacks.end(), DeletePointer());
+        mInventoryCallbacks.clear();
 }
 
 void LLViewerObject::requestInventory()
@@ -2518,10 +2521,11 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
 
 void LLViewerObject::doInventoryCallback()
 {
-        for(LLInventoryCallbackInfo* info = mInventoryCallbacks.getFirstData();
-                info != NULL;
-                info = mInventoryCallbacks.getNextData())
+        for (callback_list_t::iterator iter = mInventoryCallbacks.begin();
+                 iter != mInventoryCallbacks.end(); )
         {
+                callback_list_t::iterator curiter = iter++;
+                LLInventoryCallbackInfo* info = *curiter;
                 if (info->mListener != NULL)
                 {
                         info->mListener->inventoryChanged(this,
@@ -2532,7 +2536,8 @@ void LLViewerObject::doInventoryCallback()
                 else
                 {
                         llinfos << "LLViewerObject::doInventoryCallback() deleting bad listener entry." << llendl;
-                        mInventoryCallbacks.deleteCurrentData();
+                        delete info;
+                        mInventoryCallbacks.erase(curiter);
                 }
         }
         mInventoryPending = FALSE;
@@ -3063,6 +3068,11 @@ const LLVector3 &LLViewerObject::getPositionRegion() const
                 LLViewerObject *parent = (LLViewerObject *)getParent();
                 mPositionRegion = parent->getPositionRegion() + (getPosition() * parent->getRotation());
         }
+        else
+        {
+                mPositionRegion = getPosition();
+        }
+
         return mPositionRegion;
 }
 
@@ -3088,18 +3098,6 @@ const LLVector3 LLViewerObject::getRenderPosition() const
         }
         else
         {
-                if (isAvatar())
-                {
-                        if (isRoot())
-                        {
-                                return mDrawable->getPositionAgent();
-                        }
-                        else
-                        {
-                                return getPosition() * mDrawable->getParent()->getRenderMatrix();
-                        }
-                }
-
                 return mDrawable->getPositionAgent();
         }
 }
@@ -3771,6 +3769,26 @@ S32 LLViewerObject::setTEMediaFlags(const U8 te, const U8 media_flags)
         return retval;
 }
 
+S32 LLViewerObject::setTEGlow(const U8 te, const F32 glow)
+{
+        S32 retval = 0;
+        const LLTextureEntry *tep = getTE(te);
+        if (!tep)
+        {
+                llwarns << "No texture entry for te " << (S32)te << ", object " << mID << llendl;
+        }
+        else if (glow != tep->getGlow())
+        {
+                retval = LLPrimitive::setTEGlow(te, glow);
+                setChanged(TEXTURE);
+                if (mDrawable.notNull() && retval)
+                {
+                        gPipeline.markTextured(mDrawable);
+                }
+        }
+        return retval;
+}
+
 
 S32 LLViewerObject::setTEScale(const U8 te, const F32 s, const F32 t)
 {
@@ -4166,10 +4184,8 @@ void LLViewerObject::updateDrawable(BOOL force_damped)
 {
         if (mDrawable.notNull() && 
                 !mDrawable->isState(LLDrawable::ON_MOVE_LIST) &&
-                isChanged(MOVED) && 
-                !isAvatar())
+                isChanged(MOVED))
         {
-                mLastUpdateFrame = LLFrameTimer::getFrameCount();
                 BOOL damped_motion = 
                         !isChanged(SHIFTED) &&                                                                          // not shifted between regions this frame and...
                                 (force_damped ||                                                                                // ...forced into damped motion by application logic or...
@@ -4826,12 +4842,31 @@ void LLViewerObject::resetRot()
 
 U32 LLViewerObject::getPartitionType() const
 { 
-        return LLPipeline::PARTITION_NONE; 
+        return LLViewerRegion::PARTITION_NONE; 
 }
 
-BOOL LLAlphaObject::isParticle()
+void LLViewerObject::dirtySpatialGroup() const
 {
-        return FALSE;
+        if (mDrawable)
+        {
+                LLSpatialGroup* group = mDrawable->getSpatialGroup();
+                if (group)
+                {
+                        group->dirtyGeom();
+                }
+        }
+}
+
+void LLViewerObject::dirtyMesh() const
+{
+        if (mDrawable)
+        {
+                LLSpatialGroup* group = mDrawable->getSpatialGroup();
+                if (group)
+                {
+                        group->dirtyMesh();
+                }
+        }
 }
 
 F32 LLAlphaObject::getPartSize(S32 idx)