Ported some minor rendering engine changes from Snowglobe.

1 files changed, 41 insertions, 23 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 3ac8fc4..21a9252 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -166,7 +166,7 @@ U64 LLViewerObjectList::getIndex(const U32 local_id,
 
 BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
 {
-        if (object.mRegionp)
+        if(object.getRegion())
         {
                 U32 local_id = object.mLocalID;
                 LLHost region_host = object.getRegion()->getHost();
@@ -176,7 +176,22 @@ BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
                 U32 index = sIPAndPortToIndex[ipport];
 
                 U64     indexid = (((U64)index) << 32) | (U64)local_id;
-                return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
+                
+                std::map<U64, LLUUID>::iterator iter = sIndexAndLocalIDToUUID.find(indexid);
+                if (iter == sIndexAndLocalIDToUUID.end())
+                {
+                        return FALSE;
+                }
+                
+                // Found existing entry
+                if (iter->second == object.getID())
+                {   // Full UUIDs match, so remove the entry
+                        sIndexAndLocalIDToUUID.erase(iter);
+                        return TRUE;
+                }
+                // UUIDs did not match - this would zap a valid entry, so don't erase it
+                //llinfos << "Tried to erase entry where id in table (" 
+                //              << iter->second << ") did not match object " << object.getID() << llendl;
         }
         return FALSE;
 }
@@ -429,13 +444,27 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 
                 // This looks like it will break if the local_id of the object doesn't change
                 // upon boundary crossing, but we check for region id matching later...
-                if (objectp && (objectp->mLocalID != local_id))
+                // Reset object local id and region pointer if things have changed
+                if (objectp && 
+                        ((objectp->mLocalID != local_id) ||
+                         (objectp->getRegion() != regionp)))
                 {
                         removeFromLocalIDTable(*objectp);
                         setUUIDAndLocal(fullid,
                                                         local_id,
                                                         gMessageSystem->getSenderIP(),
                                                         gMessageSystem->getSenderPort());
+                        
+                        if (objectp->mLocalID != local_id)
+                        {    // Update local ID in object with the one sent from the region
+                                objectp->mLocalID = local_id;
+                        }
+                        
+                        if (objectp->getRegion() != regionp)
+                        {    // Object changed region, so update it
+                                objectp->setRegion(regionp);
+                                objectp->updateRegion(regionp); // for LLVOAvatar
+                        }
                 }
 
                 if (!objectp)
@@ -478,20 +507,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
                         justCreated = TRUE;
                         mNumNewObjects++;
                 }
-                else
-                {
-                        if (objectp->getRegion() != regionp)
-                        {
-                                // Object has changed region!  Update lookup tables, set region pointer.
-                                removeFromLocalIDTable(*objectp);
-                                setUUIDAndLocal(fullid,
-                                                                local_id,
-                                                                gMessageSystem->getSenderIP(),
-                                                                gMessageSystem->getSenderPort());
-                                objectp->setRegion(regionp);
-                        }
-                        objectp->updateRegion(regionp); // for LLVOAvatar
-                }
 
 
                 if (objectp->isDead())
@@ -837,10 +852,17 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep)
 
         for (S32 i = 0; i < drawablep->getNumFaces(); i++)
         {
-                LLViewerObject* objectp = drawablep->getFace(i)->getViewerObject();
+                LLFace* facep = drawablep->getFace(i) ;
+                if(facep)
+                {
+                           LLViewerObject* objectp = facep->getViewerObject();
+                           if(objectp)
+                           {
                                            mSelectPickList.erase(objectp);
                            }
                 }
+        }
+}
 
 BOOL LLViewerObjectList::killObject(LLViewerObject *objectp)
 {
@@ -876,10 +898,6 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
                 if (objectp->mRegionp == regionp)
                 {
                         killObject(objectp);
-
-                        // invalidate region pointer. region will become invalid, but 
-                        // refcounted objects may survive the cleanDeadObjects() call below
-                        objectp->mRegionp = NULL;        
                 }
         }
 
@@ -917,7 +935,7 @@ void LLViewerObjectList::killAllObjects()
         if (!mMapObjects.empty())
         {
                 llwarns << "Some objects still on map object list!" << llendl;
-                mActiveObjects.clear();
+                mMapObjects.clear();
         }
 }