aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObject.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObject.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 93b6e8d..5eed115 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -30,6 +30,7 @@ using System.Text;
30using libsecondlife; 30using libsecondlife;
31using libsecondlife.Packets; 31using libsecondlife.Packets;
32using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
33using OpenSim.Framework.Types;
33using OpenSim.Physics.Manager; 34using OpenSim.Physics.Manager;
34 35
35namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Environment.Scenes
@@ -67,12 +68,12 @@ namespace OpenSim.Region.Environment.Scenes
67 /// <summary> 68 /// <summary>
68 /// 69 ///
69 /// </summary> 70 /// </summary>
70 public SceneObject(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID) 71 public SceneObject(ulong regionHandle, Scene world, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
71 { 72 {
72 m_regionHandle = regionHandle; 73 m_regionHandle = regionHandle;
73 m_world = world; 74 m_world = world;
74 this.Pos = addPacket.ObjectData.RayEnd; 75 this.Pos = pos;
75 this.CreateRootFromPacket(addPacket, ownerID, localID); 76 this.CreateRootFromPacket(ownerID, localID, shape, pos );
76 } 77 }
77 78
78 /// <summary> 79 /// <summary>
@@ -90,9 +91,9 @@ namespace OpenSim.Region.Environment.Scenes
90 /// <param name="addPacket"></param> 91 /// <param name="addPacket"></param>
91 /// <param name="agentID"></param> 92 /// <param name="agentID"></param>
92 /// <param name="localID"></param> 93 /// <param name="localID"></param>
93 public void CreateRootFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID) 94 public void CreateRootFromPacket(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos)
94 { 95 {
95 this.rootPrimitive = new Primitive( this.m_regionHandle, this.m_world, addPacket, agentID, localID, true, this, this); 96 this.rootPrimitive = new Primitive( this.m_regionHandle, this.m_world, agentID, localID, true, this, this, shape, pos);
96 this.children.Add(rootPrimitive); 97 this.children.Add(rootPrimitive);
97 this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive); 98 this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive);
98 } 99 }