aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-04-29 08:42:51 -0700
committerDiva Canto2011-04-29 08:42:51 -0700
commit73caa4e94abc920269c2eba8423be49192ef184b (patch)
treecc2c8a03cc60694cd587d93e68d47bf20c11aa2c
parentMinor improvement in version checking (Simulation service) (diff)
downloadopensim-SC_OLD-73caa4e94abc920269c2eba8423be49192ef184b.zip
opensim-SC_OLD-73caa4e94abc920269c2eba8423be49192ef184b.tar.gz
opensim-SC_OLD-73caa4e94abc920269c2eba8423be49192ef184b.tar.bz2
opensim-SC_OLD-73caa4e94abc920269c2eba8423be49192ef184b.tar.xz
Minor correction to yesterday's changes. Make normal prim crossing (no attach) work well again.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index bccbe68..19a9506 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3361,8 +3361,6 @@ namespace OpenSim.Region.Framework.Scenes
3361 { 3361 {
3362 SceneObjectGroup sog = Copy(false); 3362 SceneObjectGroup sog = Copy(false);
3363 sog.m_isDeleted = false; 3363 sog.m_isDeleted = false;
3364 sog.RootPart.IsAttachment = false;
3365 sog.RootPart.GroupPosition = sog.RootPart.AttachedPos;
3366 return sog; 3364 return sog;
3367 } 3365 }
3368 3366
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 507fc50..fe4a7d1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3108,6 +3108,9 @@ namespace OpenSim.Region.Framework.Scenes
3108 // We need to make a copy and pass that copy 3108 // We need to make a copy and pass that copy
3109 // because of transfers withn the same sim 3109 // because of transfers withn the same sim
3110 ISceneObject clone = sog.CloneForNewScene(); 3110 ISceneObject clone = sog.CloneForNewScene();
3111 // Attachment module assumes that GroupPosition holds the offsets...!
3112 ((SceneObjectGroup)clone).RootPart.GroupPosition = sog.RootPart.AttachedPos;
3113 ((SceneObjectGroup)clone).RootPart.IsAttachment = false;
3111 cAgent.AttachmentObjects.Add(clone); 3114 cAgent.AttachmentObjects.Add(clone);
3112 cAgent.AttachmentObjectStates.Add(sog.GetStateSnapshot()); 3115 cAgent.AttachmentObjectStates.Add(sog.GetStateSnapshot());
3113 } 3116 }