aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObject(Old).cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject(Old).cs (renamed from OpenSim/Region/Environment/Scenes/SceneObject.cs)18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject(Old).cs
index 2fae556..882b72e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject(Old).cs
@@ -38,7 +38,7 @@ using OpenSim.Physics.Manager;
38 38
39namespace OpenSim.Region.Environment.Scenes 39namespace OpenSim.Region.Environment.Scenes
40{ 40{
41 public class SceneObject : EntityBase 41 public class SceneObjectOLD : EntityBase
42 { 42 {
43 private Encoding enc = Encoding.ASCII; 43 private Encoding enc = Encoding.ASCII;
44 private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group 44 private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes
86 /// <summary> 86 /// <summary>
87 /// 87 ///
88 /// </summary> 88 /// </summary>
89 public SceneObject(Scene world, EventManager eventManager, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) 89 public SceneObjectOLD(Scene world, EventManager eventManager, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
90 { 90 {
91 m_regionHandle = world.RegionInfo.RegionHandle; 91 m_regionHandle = world.RegionInfo.RegionHandle;
92 m_scene = world; 92 m_scene = world;
@@ -102,7 +102,7 @@ namespace OpenSim.Region.Environment.Scenes
102 /// 102 ///
103 /// </summary> 103 /// </summary>
104 /// <remarks>Need a null constructor for duplication</remarks> 104 /// <remarks>Need a null constructor for duplication</remarks>
105 public SceneObject() 105 public SceneObjectOLD()
106 { 106 {
107 107
108 } 108 }
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Environment.Scenes
125 /// <param name="datastore"></param> 125 /// <param name="datastore"></param>
126 public void ProcessBackup(OpenSim.Region.Interfaces.IRegionDataStore datastore) 126 public void ProcessBackup(OpenSim.Region.Interfaces.IRegionDataStore datastore)
127 { 127 {
128 datastore.StoreObject(this); 128 // datastore.StoreObject(this);
129 } 129 }
130 130
131 /// <summary> 131 /// <summary>
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Environment.Scenes
134 private void ProcessParcelPrimCountUpdate() 134 private void ProcessParcelPrimCountUpdate()
135 { 135 {
136 136
137 m_eventManager.TriggerParcelPrimCountAdd(this); 137 // m_eventManager.TriggerParcelPrimCountAdd(this);
138 } 138 }
139 139
140 /// <summary> 140 /// <summary>
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment.Scenes
146 public void CreateRootFromShape(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos) 146 public void CreateRootFromShape(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos)
147 { 147 {
148 148
149 this.rootPrimitive = new Primitive(this.m_regionHandle, this.m_scene, agentID, localID, true, this, this, shape, pos); 149 // this.rootPrimitive = new Primitive(this.m_regionHandle, this.m_scene, agentID, localID, true, this, this, shape, pos);
150 this.m_children.Add(rootPrimitive); 150 this.m_children.Add(rootPrimitive);
151 151
152 this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive); 152 this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive);
@@ -165,9 +165,9 @@ namespace OpenSim.Region.Environment.Scenes
165 /// Makes a copy of this SceneObject (and child primitives) 165 /// Makes a copy of this SceneObject (and child primitives)
166 /// </summary> 166 /// </summary>
167 /// <returns>A complete copy of the object</returns> 167 /// <returns>A complete copy of the object</returns>
168 public new SceneObject Copy() 168 public new SceneObjectOLD Copy()
169 { 169 {
170 SceneObject dupe = new SceneObject(); 170 SceneObjectOLD dupe = new SceneObjectOLD();
171 171
172 dupe.m_scene = this.m_scene; 172 dupe.m_scene = this.m_scene;
173 dupe.m_eventManager = this.m_eventManager; 173 dupe.m_eventManager = this.m_eventManager;
@@ -207,7 +207,7 @@ namespace OpenSim.Region.Environment.Scenes
207 /// 207 ///
208 /// </summary> 208 /// </summary>
209 /// <param name="primObject"></param> 209 /// <param name="primObject"></param>
210 public void AddNewChildPrims(SceneObject primObject) 210 public void AddNewChildPrims(SceneObjectOLD primObject)
211 { 211 {
212 this.rootPrimitive.AddNewChildren(primObject); 212 this.rootPrimitive.AddNewChildren(primObject);
213 } 213 }