Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-09 20:25:05 +01:00
3 changed files with 34 additions and 21 deletions

View File

@@ -1206,6 +1206,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
detachedpos = avatar.AbsolutePosition;
RootPart.FromItemID = UUID.Zero;
AbsolutePosition = detachedpos;
m_rootPart.AttachedAvatar = UUID.Zero;