diff options
author | Justin Clarke Casey | 2008-11-01 21:28:52 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-01 21:28:52 +0000 |
commit | b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8 (patch) | |
tree | d0e0af8fe1a69864a0ab707cb664825f6c393914 /OpenSim/Region/Environment/Scenes | |
parent | Make the IM and friends modules optional. Clean up some code that dealt (diff) | |
download | opensim-SC-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.zip opensim-SC-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.gz opensim-SC-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.bz2 opensim-SC-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.xz |
* Fix http://opensimulator.org/mantis/view.php?id=2517
* Don't save attachments on saving oar, which stops them coming back as ghost prims
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EntityBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index afdbb91..7a3b9a7 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
64 | } | 64 | } |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// Signals whether this group was in a scene but has since been deleted from it. | 67 | /// Signals whether this entity was in a scene but has since been removed from it. |
68 | /// </summary> | 68 | /// </summary> |
69 | public bool IsDeleted | 69 | public bool IsDeleted |
70 | { | 70 | { |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 98c7fb5..f4b6685 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -741,7 +741,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
741 | { | 741 | { |
742 | m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor); | 742 | m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor); |
743 | m_rootPart.PhysActor = null; | 743 | m_rootPart.PhysActor = null; |
744 | |||
745 | } | 744 | } |
746 | 745 | ||
747 | AbsolutePosition = AttachOffset; | 746 | AbsolutePosition = AttachOffset; |