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.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 7c49ddb..68d214b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Region.Environment.Scenes
48 private PhysicsActor m_PhysActor; 48 private PhysicsActor m_PhysActor;
49 49
50 private EventManager m_eventManager; 50 private EventManager m_eventManager;
51 private ParcelManager m_parcelManager;
52 51
53 public LLUUID rootUUID 52 public LLUUID rootUUID
54 { 53 {
@@ -79,12 +78,11 @@ namespace OpenSim.Region.Environment.Scenes
79 /// <summary> 78 /// <summary>
80 /// 79 ///
81 /// </summary> 80 /// </summary>
82 public SceneObject(Scene world, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) 81 public SceneObject(Scene world, EventManager eventManager, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
83 { 82 {
84 m_regionHandle = world.RegionInfo.RegionHandle; 83 m_regionHandle = world.RegionInfo.RegionHandle;
85 m_world = world; 84 m_world = world;
86 m_eventManager = world.EventManager; 85 m_eventManager = eventManager;
87 m_parcelManager = world.ParcelManager;
88 86
89 this.Pos = pos; 87 this.Pos = pos;
90 this.CreateRootFromShape(ownerID, localID, shape, pos); 88 this.CreateRootFromShape(ownerID, localID, shape, pos);
@@ -127,7 +125,7 @@ namespace OpenSim.Region.Environment.Scenes
127 /// </summary> 125 /// </summary>
128 private void ProcessParcelPrimCountUpdate() 126 private void ProcessParcelPrimCountUpdate()
129 { 127 {
130 m_parcelManager.addPrimToParcelCounts(this); 128 m_eventManager.TriggerParcelPrimCountAdd(this);
131 } 129 }
132 130
133 131
@@ -141,7 +139,7 @@ namespace OpenSim.Region.Environment.Scenes
141 /// <param name="localID"></param> 139 /// <param name="localID"></param>
142 public void CreateRootFromShape(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos) 140 public void CreateRootFromShape(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos)
143 { 141 {
144 this.rootPrimitive = new Primitive(this.m_regionHandle, this.m_world,this.m_parcelManager, agentID, localID, true, this, this, shape, pos); 142 this.rootPrimitive = new Primitive(this.m_regionHandle, this.m_world,this.m_eventManager, agentID, localID, true, this, this, shape, pos);
145 this.children.Add(rootPrimitive); 143 this.children.Add(rootPrimitive);
146 this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive); 144 this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive);
147 } 145 }