diff options
Diffstat (limited to '')
3 files changed, 4 insertions, 5 deletions
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 | |||
262 | scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); | 262 | scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); |
263 | scene.SendKillObject(scene.Entities[uuid].LocalId); | 263 | scene.SendKillObject(scene.Entities[uuid].LocalId); |
264 | scene.m_innerScene.DeleteSceneObject(uuid, false); | 264 | scene.m_innerScene.DeleteSceneObject(uuid, false); |
265 | ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(); | 265 | ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(false); |
266 | } | 266 | } |
267 | catch(Exception e) | 267 | catch(Exception e) |
268 | { | 268 | { |
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 | |||
211 | 211 | ||
212 | public void SendFullUpdate(IClientAPI client, uint clientFlags) | 212 | public void SendFullUpdate(IClientAPI client, uint clientFlags) |
213 | { | 213 | { |
214 | m_Entity.SendFullUpdateToClient(client, clientFlags); | 214 | m_Entity.SendFullUpdateToClient(client); |
215 | } | 215 | } |
216 | 216 | ||
217 | public void SendFullUpdateToAll() | 217 | public void SendFullUpdateToAll() |
218 | { | 218 | { |
219 | uint clientFlags = 0; | ||
220 | m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) | 219 | m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) |
221 | { m_Entity.SendFullUpdateToClient(controller, clientFlags); } | 220 | { m_Entity.SendFullUpdateToClient(controller); } |
222 | ); | 221 | ); |
223 | } | 222 | } |
224 | 223 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs index 827540d..b6879b0 100644 --- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs | |||
@@ -181,7 +181,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator | |||
181 | 181 | ||
182 | if (Util.RandomClass.NextDouble() < killLikelyhood) | 182 | if (Util.RandomClass.NextDouble() < killLikelyhood) |
183 | { | 183 | { |
184 | m_scene.DeleteSceneObject(selectedTree.ParentGroup); | 184 | m_scene.DeleteSceneObject(selectedTree.ParentGroup, false); |
185 | m_trees.Remove(selectedTree.ParentGroup.UUID); | 185 | m_trees.Remove(selectedTree.ParentGroup.UUID); |
186 | 186 | ||
187 | m_scene.ForEachClient(delegate(IClientAPI controller) | 187 | m_scene.ForEachClient(delegate(IClientAPI controller) |