diff options
author | Teravus Ovares | 2008-01-15 04:27:02 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-01-15 04:27:02 +0000 |
commit | 492e72b21a340d70fce4eea3ea831d6de720bf23 (patch) | |
tree | 68da7731bf258236e55b5b15ec4ae3993ae89beb | |
parent | * Pass 2 of collidable (non physical) linksets (diff) | |
download | opensim-SC-492e72b21a340d70fce4eea3ea831d6de720bf23.zip opensim-SC-492e72b21a340d70fce4eea3ea831d6de720bf23.tar.gz opensim-SC-492e72b21a340d70fce4eea3ea831d6de720bf23.tar.bz2 opensim-SC-492e72b21a340d70fce4eea3ea831d6de720bf23.tar.xz |
* Delinking doesn't leave invisible physical objects behind anymore
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index b591802..2e0b916 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -917,9 +917,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
917 | 917 | ||
918 | if (null != linkPart) | 918 | if (null != linkPart) |
919 | { | 919 | { |
920 | |||
920 | // Remove the part from this object | 921 | // Remove the part from this object |
921 | m_parts.Remove(linkPart.UUID); | 922 | m_parts.Remove(linkPart.UUID); |
922 | linkPart.ParentID = 0; | 923 | linkPart.ParentID = 0; |
924 | |||
925 | if (linkPart.PhysActor != null) | ||
926 | { | ||
927 | m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); | ||
928 | } | ||
923 | // We need to reset the child part's position | 929 | // We need to reset the child part's position |
924 | // ready for life as a separate object after being a part of another object | 930 | // ready for life as a separate object after being a part of another object |
925 | Quaternion parentRot | 931 | Quaternion parentRot |