aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-17 15:52:27 +0000
committerJustin Clarke Casey2008-11-17 15:52:27 +0000
commitf16cf1284011c2376dedc3ac23919c5eb6abab5d (patch)
tree27d1958b122a748b501b9ab48e69dd5aa0640c02 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
parent* Stop nulling SOG.m_rootPart and parts on object deletion (diff)
downloadopensim-SC_OLD-f16cf1284011c2376dedc3ac23919c5eb6abab5d.zip
opensim-SC_OLD-f16cf1284011c2376dedc3ac23919c5eb6abab5d.tar.gz
opensim-SC_OLD-f16cf1284011c2376dedc3ac23919c5eb6abab5d.tar.bz2
opensim-SC_OLD-f16cf1284011c2376dedc3ac23919c5eb6abab5d.tar.xz
* Fix probable partial breakage of delete to inventory in last commit
* Not nulling out parts and the root part allows the code to be simplified
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index cc8501d..5dd1654 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1763,11 +1763,7 @@ namespace OpenSim.Region.Environment.Scenes
1763 } 1763 }
1764 } 1764 }
1765 } 1765 }
1766 1766
1767 // Finally remove the item, for reals this time.
1768 if (permissionToDelete)
1769 DeleteSceneObject(objectGroup, false);
1770
1771 return assetID; 1767 return assetID;
1772 } 1768 }
1773 1769