diff options
author | Justin Clarke Casey | 2008-06-21 19:56:19 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-21 19:56:19 +0000 |
commit | b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6 (patch) | |
tree | bbc2b33cc84ba305709e325e580d64a5e07798ff /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * minor: start saving current prims xml to an objects/ directory in the archive (diff) | |
download | opensim-SC_OLD-b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6.zip opensim-SC_OLD-b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6.tar.gz opensim-SC_OLD-b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6.tar.bz2 opensim-SC_OLD-b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6.tar.xz |
* Remove a bug I created in r5171 where taking an object would terminate the client session
* change code to use an explicit state variable instead of using SOG.Name = null to signal deletion
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 73b3a49..aa74072 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1665,7 +1665,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1665 | } | 1665 | } |
1666 | 1666 | ||
1667 | /// <summary> | 1667 | /// <summary> |
1668 | /// Delete this object from the scene. | 1668 | /// Delete the given object from the scene. |
1669 | /// </summary> | 1669 | /// </summary> |
1670 | /// <param name="group"></param> | 1670 | /// <param name="group"></param> |
1671 | public void DeleteSceneObject(SceneObjectGroup group) | 1671 | public void DeleteSceneObject(SceneObjectGroup group) |
@@ -1686,14 +1686,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1686 | 1686 | ||
1687 | group.DeleteGroup(); | 1687 | group.DeleteGroup(); |
1688 | group.DeleteParts(); | 1688 | group.DeleteParts(); |
1689 | |||
1690 | // In case anybody else retains a reference to this group, signal deletion by changing the name | ||
1691 | // to null. We can't zero out the UUID because this is taken from the root part, which has already | ||
1692 | // been removed. | ||
1693 | // FIXME: This is a really poor temporary solution, since it still leaves plenty of scope for race | ||
1694 | // conditions where a user deletes an entity while it is being stored. Really, the update | ||
1695 | // code needs a redesign. | ||
1696 | group.Name = null; | ||
1697 | } | 1689 | } |
1698 | 1690 | ||
1699 | /// <summary> | 1691 | /// <summary> |