aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2010-06-09 20:25:05 +0100
committerMelanie2010-06-09 20:25:05 +0100
commit1dce2436613de7772a91013cd2defc977b5adb26 (patch)
tree0a105bd8fedd0c6b4c15b6268bdb32b1f069c0c6 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentGive attachments the same priority as other avatars in BestAvatarResponsiveness (diff)
parentBug fix on attachments: attach->drop->attach works now. (diff)
downloadopensim-SC-1dce2436613de7772a91013cd2defc977b5adb26.zip
opensim-SC-1dce2436613de7772a91013cd2defc977b5adb26.tar.gz
opensim-SC-1dce2436613de7772a91013cd2defc977b5adb26.tar.bz2
opensim-SC-1dce2436613de7772a91013cd2defc977b5adb26.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f918291..66ad14f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1206,6 +1206,7 @@ namespace OpenSim.Region.Framework.Scenes
1206 return; 1206 return;
1207 1207
1208 detachedpos = avatar.AbsolutePosition; 1208 detachedpos = avatar.AbsolutePosition;
1209 RootPart.FromItemID = UUID.Zero;
1209 1210
1210 AbsolutePosition = detachedpos; 1211 AbsolutePosition = detachedpos;
1211 m_rootPart.AttachedAvatar = UUID.Zero; 1212 m_rootPart.AttachedAvatar = UUID.Zero;