Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 14 insertions, 12 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 4961f48..059925e 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -75,6 +75,8 @@
 
 #include "llappviewer.h"
 
+#include "primbackup.h"
+
 extern F32 gMinObjectDistance;
 extern BOOL gAnimateTextures;
 
@@ -164,7 +166,7 @@ U64 LLViewerObjectList::getIndex(const U32 local_id,
 
 BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
 {
-        if(object.getRegion())
+        if (object.mRegionp)
         {
                 U32 local_id = object.mLocalID;
                 LLHost region_host = object.getRegion()->getHost();
@@ -176,8 +178,7 @@ BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
                 U64     indexid = (((U64)index) << 32) | (U64)local_id;
                 return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
         }
-
-        return FALSE ;
+        return FALSE;
 }
 
 void LLViewerObjectList::setUUIDAndLocal(const LLUUID &id,
@@ -223,6 +224,11 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
 
         updateActive(objectp);
 
+        if(!just_created)
+                primbackup::getInstance()->prim_update(objectp);
+        
+
+
         if (just_created) 
         {
                 gPipeline.addObject(objectp);
@@ -252,6 +258,9 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
                 objectp->mCreateSelected = false;
                 gViewerWindow->getWindow()->decBusyCount();
                 gViewerWindow->getWindow()->setCursor( UI_CURSOR_ARROW );
+
+                primbackup::getInstance()->newprim(objectp);
+
         }
 }
 
@@ -828,17 +837,10 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep)
 
         for (S32 i = 0; i < drawablep->getNumFaces(); i++)
         {
-                LLFace* facep = drawablep->getFace(i) ;
-                if(facep)
-                {
-                           LLViewerObject* objectp = facep->getViewerObject();
-                           if(objectp)
-                           {
+                LLViewerObject* objectp = drawablep->getFace(i)->getViewerObject();
                                            mSelectPickList.erase(objectp);
                            }
                 }
-        }
-}
 
 BOOL LLViewerObjectList::killObject(LLViewerObject *objectp)
 {
@@ -915,7 +917,7 @@ void LLViewerObjectList::killAllObjects()
         if (!mMapObjects.empty())
         {
                 llwarns << "Some objects still on map object list!" << llendl;
-                mMapObjects.clear();
+                mActiveObjects.clear();
         }
 }