From 48c6d052d94a7ab57c5264f09e989fa717c730f5 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 7 Nov 2008 05:48:44 +0000
Subject: Attachments, attachments, and, did I say attachments? Too many fixes
 to list.

---
 .../Region/Environment/Modules/ContentManagementSystem/CMModel.cs    | 2 +-
 .../Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/ContentManagementSystem')

diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
index edf5ec1..9d81262 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
                     scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
                     scene.SendKillObject(scene.Entities[uuid].LocalId);
                     scene.m_innerScene.DeleteSceneObject(uuid, false);
-                    ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup();
+                    ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(false);
                 }
                 catch(Exception e)
                 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
index d6fca7b..16edc2c 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
@@ -211,14 +211,13 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
 
         public void SendFullUpdate(IClientAPI client, uint clientFlags)
         {
-            m_Entity.SendFullUpdateToClient(client, clientFlags);
+            m_Entity.SendFullUpdateToClient(client);
         }
 
         public void SendFullUpdateToAll()
         {
-            uint clientFlags = 0;
             m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller)
-                                                       { m_Entity.SendFullUpdateToClient(controller, clientFlags); }
+                                                       { m_Entity.SendFullUpdateToClient(controller); }
             );
         }
 
-- 
cgit v1.1