aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 816b01d..82e112f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1251,14 +1251,12 @@ namespace OpenSim.Region.Environment.Scenes
1251 } 1251 }
1252 } 1252 }
1253 1253
1254
1255 if (permissionToDelete) 1254 if (permissionToDelete)
1256 { 1255 {
1257 DeleteSceneObjectGroup(objectGroup); 1256 DeleteSceneObject(objectGroup);
1258 } 1257 }
1259 } 1258 }
1260 } 1259 }
1261
1262 } 1260 }
1263 1261
1264 public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID) 1262 public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID)
@@ -1790,7 +1788,7 @@ namespace OpenSim.Region.Environment.Scenes
1790 1788
1791 returnobjects[i] = null; 1789 returnobjects[i] = null;
1792 1790
1793 DeleteSceneObjectGroup(ObjectDeleting); 1791 DeleteSceneObject(ObjectDeleting);
1794 ObjectDeleting = null; 1792 ObjectDeleting = null;
1795 } 1793 }
1796 else 1794 else