aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-02-08 19:10:54 +0000
committerJustin Clark-Casey (justincc)2010-02-08 19:10:54 +0000
commit9f4883d1468b5fe1c60e1831b24e1fed1eb5caeb (patch)
treeb47729153fe86d031ef2a442996fb4d864e73ffb /OpenSim/Region/Framework/Scenes/Scene.cs
parentAdd EventManager.OnIncomingSceneObject event which is triggered by an incomin... (diff)
downloadopensim-SC_OLD-9f4883d1468b5fe1c60e1831b24e1fed1eb5caeb.zip
opensim-SC_OLD-9f4883d1468b5fe1c60e1831b24e1fed1eb5caeb.tar.gz
opensim-SC_OLD-9f4883d1468b5fe1c60e1831b24e1fed1eb5caeb.tar.bz2
opensim-SC_OLD-9f4883d1468b5fe1c60e1831b24e1fed1eb5caeb.tar.xz
refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in Scene.AddSceneObject since this wraps a check that is much less clear
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 039d074..ddebd0b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2483,7 +2483,7 @@ namespace OpenSim.Region.Framework.Scenes
2483 foreach (SceneObjectPart p in sceneObject.Children.Values) 2483 foreach (SceneObjectPart p in sceneObject.Children.Values)
2484 p.LocalId = 0; 2484 p.LocalId = 0;
2485 2485
2486 if ((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0)) // Attachment 2486 if (sceneObject.IsAttachmentCheckFull()) // Attachment
2487 { 2487 {
2488 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); 2488 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
2489 sceneObject.RootPart.AddFlag(PrimFlags.Phantom); 2489 sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
@@ -2518,9 +2518,7 @@ namespace OpenSim.Region.Framework.Scenes
2518 AttachObject( 2518 AttachObject(
2519 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false); 2519 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
2520 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2520 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2521 grp.SendGroupFullUpdate(); 2521 grp.SendGroupFullUpdate();
2522
2523
2524 } 2522 }
2525 else 2523 else
2526 { 2524 {