Merge branch 'prephysics_kitty' into prephysics

OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs

@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
 
             //Register for local Scene events
             m_scene.EventManager.OnPostSceneCreation += OnPostSceneCreation;
-            m_scene.EventManager.OnObjectBeingRemovedFromScene += new EventManager.ObjectBeingRemovedFromScene(RegionSyncModule_OnObjectBeingRemovedFromScene);
+            //m_scene.EventManager.OnObjectBeingRemovedFromScene += new EventManager.ObjectBeingRemovedFromScene(RegionSyncModule_OnObjectBeingRemovedFromScene);
 
         }
 
@@ -1273,7 +1273,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
         /// only be triggered by an object removal that is initiated locally.
         /// </summary>
         /// <param name="sog"></param>
-        private void RegionSyncModule_OnObjectBeingRemovedFromScene(SceneObjectGroup sog)
+        //private void RegionSyncModule_OnObjectBeingRemovedFromScene(SceneObjectGroup sog)
+        public void SendDeleteObject(SceneObjectGroup sog)
         {
             //m_log.DebugFormat("RegionSyncModule_OnObjectBeingRemovedFromScene called at time {0}:{1}:{2}", DateTime.Now.Minute, DateTime.Now.Second, DateTime.Now.Millisecond);
 

OpenSim/Region/Framework/Interfaces/IRegionSyncModule.cs

@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Interfaces
         //void SendUpdatesToSynchronizeState(List<SceneObjectGroup> sog);
         void SendSceneUpdates();
         void SendTerrainUpdates(string lastUpdateActorID);
-        //void SendDeleteObject(SceneObjectGroup sog);
+        void SendDeleteObject(SceneObjectGroup sog);
 
         //For propogating scene events to other actors
         void PublishSceneEvent(EventManager.EventNames ev, Object[] evArgs);

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -376,6 +376,17 @@ namespace OpenSim.Region.Framework.Scenes
 
             SceneObjectPart part = GetSceneObjectPart(primID);
             SceneObjectGroup group = part.ParentGroup;
+
+            if (null == group)
+            {
+                m_log.ErrorFormat(
+                    "[PRIM INVENTORY]: " +
+                    "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist",
+                    itemID, primID);
+
+                return new ArrayList();
+            }
+
             if (isScriptRunning)
             {
                 m_log.Debug("To RemoveScriptInstance");
@@ -385,6 +396,16 @@ namespace OpenSim.Region.Framework.Scenes
             // Retrieve item
             TaskInventoryItem item = group.GetInventoryItem(part.LocalId, itemID);
 
+            if (null == item)
+            {
+                m_log.ErrorFormat(
+                    "[PRIM INVENTORY]: Tried to retrieve item ID {0} from prim {1}, {2} for caps script update "
+                        + " but the item does not exist in this inventory",
+                    itemID, part.Name, part.UUID);
+
+                return new ArrayList();
+            }
+
             // Update item with new asset
             item.AssetID = newAssetID;
             group.UpdateInventoryItem(item);

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -662,8 +662,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (UnlinkSceneObject(group, false))
             {
-                //For object removals caused by remote events (by other actors), do not trigger local event ObjectBeingRemovedFromScene
+                EventManager.TriggerObjectBeingRemovedFromScene(group);
-                //EventManager.TriggerObjectBeingRemovedFromScene(group);
                 EventManager.TriggerParcelPrimCountTainted();
             }
 
@@ -2430,8 +2429,16 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 part.SyncInfoUpdate();
             }
-            //end of SYMMETRIC SYNC
+             *  
              * */
+
+            //Propagate the RemovedObject message
+            if (RegionSyncModule != null)
+            {
+                RegionSyncModule.SendDeleteObject(group);
+            }
+            //end of SYMMETRIC SYNC
+             
         }
 
         /// <summary>
@@ -3592,9 +3599,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
 
+            //SYMMETRIC SYNC: object remove should be handled through RegionSyncModule
             // REGION SYNC
+            /*
             if( IsSyncedServer() )
                 RegionSyncServerModule.DeleteObject(m_regionHandle, localID, part);
+             * */ 
         }
 
         #endregion

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -1163,7 +1163,8 @@ namespace OpenSim.Region.Framework.Scenes
                     Scene.RegionSyncServerModule.DeleteObject(part.RegionHandle, part.LocalId, part);
                     //return;
                 }
-                 * */ 
+                 * */
+                //end of SYMMETRIC SYNC
 
                 Scene.ForEachScenePresence(delegate(ScenePresence avatar)
                 {

OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

@@ -539,6 +539,9 @@ namespace OpenSim.Region.Framework.Scenes
             //m_inventorySerial += 2;
             HasInventoryChanged = true;
             m_part.ParentGroup.HasGroupChanged = true;
+
+            //SYMMETRIC SYNC: add ScheduleFullUpdate to enable synchronization across actors
+            m_part.ScheduleFullUpdate();
         }
 
         /// <summary>