diff options
| author | Melanie | 2010-11-08 02:39:06 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-08 02:39:06 +0000 |
| commit | 18b27408d6af27a3880298c6f3acdaef3fb7d030 (patch) | |
| tree | 596de3fc4707dddf5dbeb2f5044d4e71e170bab1 /OpenSim/Region/Framework | |
| parent | Call the cleanup after saving attachment states, so that the attachments (diff) | |
| download | opensim-SC_OLD-18b27408d6af27a3880298c6f3acdaef3fb7d030.zip opensim-SC_OLD-18b27408d6af27a3880298c6f3acdaef3fb7d030.tar.gz opensim-SC_OLD-18b27408d6af27a3880298c6f3acdaef3fb7d030.tar.bz2 opensim-SC_OLD-18b27408d6af27a3880298c6f3acdaef3fb7d030.tar.xz | |
Prevent plants from being treated like dropped attachments and removed
from the sim.
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 77d7472..3576a88 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4999,8 +4999,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4999 | { | 4999 | { |
| 5000 | if (grp.RootPart.Shape.State != 0) | 5000 | if (grp.RootPart.Shape.State != 0) |
| 5001 | { | 5001 | { |
| 5002 | UUID agentID = grp.OwnerID; | 5002 | if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp))) |
| 5003 | if (agentID == UUID.Zero) | ||
| 5004 | { | 5003 | { |
| 5005 | objectsToDelete.Add(grp); | 5004 | objectsToDelete.Add(grp); |
| 5006 | return; | 5005 | return; |