diff options
author | Sean Dague | 2009-08-31 20:16:32 -0400 |
---|---|---|
committer | Sean Dague | 2009-08-31 20:16:32 -0400 |
commit | 4333bc7742b1aac3f548073cde2048ef678ffa3b (patch) | |
tree | 84dcf03ea648ae1b3a70f99faff3b2faff7492ff /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | change regular test target to use nunit exec mode (diff) | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC_OLD-4333bc7742b1aac3f548073cde2048ef678ffa3b.zip opensim-SC_OLD-4333bc7742b1aac3f548073cde2048ef678ffa3b.tar.gz opensim-SC_OLD-4333bc7742b1aac3f548073cde2048ef678ffa3b.tar.bz2 opensim-SC_OLD-4333bc7742b1aac3f548073cde2048ef678ffa3b.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 46e3289..857dc11 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3509,8 +3509,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3509 | { | 3509 | { |
3510 | // Set the parent localID to 0 so it transfers over properly. | 3510 | // Set the parent localID to 0 so it transfers over properly. |
3511 | gobj.RootPart.SetParentLocalId(0); | 3511 | gobj.RootPart.SetParentLocalId(0); |
3512 | gobj.RootPart.IsAttachment = false; | ||
3513 | gobj.AbsolutePosition = gobj.RootPart.AttachedPos; | 3512 | gobj.AbsolutePosition = gobj.RootPart.AttachedPos; |
3513 | gobj.RootPart.IsAttachment = false; | ||
3514 | //gobj.RootPart.LastOwnerID = gobj.GetFromAssetID(); | 3514 | //gobj.RootPart.LastOwnerID = gobj.GetFromAssetID(); |
3515 | m_log.DebugFormat("[ATTACHMENT]: Sending attachment {0} to region {1}", gobj.UUID, regionHandle); | 3515 | m_log.DebugFormat("[ATTACHMENT]: Sending attachment {0} to region {1}", gobj.UUID, regionHandle); |
3516 | m_scene.CrossPrimGroupIntoNewRegion(regionHandle, gobj, silent); | 3516 | m_scene.CrossPrimGroupIntoNewRegion(regionHandle, gobj, silent); |