1 files changed, 0 insertions, 138 deletions
diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs
deleted file mode 100644
index 40f9b13..0000000
--- a/OpenSim/OpenSim.World/Entity.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Axiom.MathLib;
-using OpenSim.Physics.Manager;
-using OpenSim.Region.types;
-using libsecondlife;
-using OpenSim.Region.Scripting;
-namespace OpenSim.Region
-{
-    public abstract class Entity : IScriptReadonlyEntity
-    {
-        public libsecondlife.LLUUID uuid;
-        public uint localid;
-        public LLVector3 velocity;
-        public Quaternion rotation;
-        protected List<Entity> children;
-        protected LLVector3 m_pos;
-        protected PhysicsActor _physActor;
-        protected World m_world;
-        protected string m_name;
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual string Name
-        {
-            get { return m_name; }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual LLVector3 Pos
-        {
-            get
-            {
-                if (this._physActor != null)
-                {
-                    m_pos.X = _physActor.Position.X;
-                    m_pos.Y = _physActor.Position.Y;
-                    m_pos.Z = _physActor.Position.Z;
-                }
-                return m_pos;
-            }
-            set
-            {
-                if (this._physActor != null)
-                {
-                    try
-                    {
-                        lock (this.m_world.SyncRoot)
-                        {
-                            this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e.Message);
-                    }
-                }
-                m_pos = value;
-            }
-        }
-        /// <summary>
-        /// Creates a new Entity (should not occur on it's own)
-        /// </summary>
-        public Entity()
-        {
-            uuid = new libsecondlife.LLUUID();
-            localid = 0;
-            m_pos = new LLVector3();
-            velocity = new LLVector3();
-            rotation = new Quaternion();
-            m_name = "(basic entity)";
-            children = new List<Entity>();
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual void addForces()
-        {
-                foreach (Entity child in children)
-            {
-                child.addForces();
-            }
-        }
-        /// <summary>
-        /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
-        /// </summary>
-        public virtual void update() {
-            // Do any per-frame updates needed that are applicable to every type of entity
-            foreach (Entity child in children)
-            {
-                child.update();
-            }
-        }
-        /// <summary>
-        /// Returns a mesh for this object and any dependents
-        /// </summary>
-        /// <returns>The mesh of this entity tree</returns>
-        public virtual Mesh getMesh()
-        {
-            Mesh mesh = new Mesh();
-            foreach (Entity child in children)
-            {
-                mesh += child.getMesh();
-            }
-            return mesh;
-        }
-        
-        /// <summary>
-        /// Called at a set interval to inform entities that they should back themsleves up to the DB 
-        /// </summary>
-        public virtual void BackUp()
-        {
-                
-        }
-        /// <summary>
-        /// Infoms the entity that the land (heightmap) has changed
-        /// </summary>
-        public virtual void LandRenegerated()
-        {
-        }
-    }
-}

diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs deleted file mode 100644 index 40f9b13..0000000 --- a/OpenSim/OpenSim.World/Entity.cs +++ /dev/null
@@ -1,138 +0,0 @@
1	using System;
2	using System.Collections.Generic;
3	using System.Text;
4	using Axiom.MathLib;
5	using OpenSim.Physics.Manager;
6	using OpenSim.Region.types;
7	using libsecondlife;
8	using OpenSim.Region.Scripting;
9
10	namespace OpenSim.Region
11	{
12	public abstract class Entity : IScriptReadonlyEntity
13	{
14	public libsecondlife.LLUUID uuid;
15	public uint localid;
16	public LLVector3 velocity;
17	public Quaternion rotation;
18	protected List<Entity> children;
19	protected LLVector3 m_pos;
20	protected PhysicsActor _physActor;
21	protected World m_world;
22	protected string m_name;
23
24	/// <summary>
25	///
26	/// </summary>
27	public virtual string Name
28	{
29	get { return m_name; }
30	}
31
32	/// <summary>
33	///
34	/// </summary>
35	public virtual LLVector3 Pos
36	{
37	get
38	{
39	if (this._physActor != null)
40	{
41	m_pos.X = _physActor.Position.X;
42	m_pos.Y = _physActor.Position.Y;
43	m_pos.Z = _physActor.Position.Z;
44	}
45
46	return m_pos;
47	}
48	set
49	{
50	if (this._physActor != null)
51	{
52	try
53	{
54	lock (this.m_world.SyncRoot)
55	{
56
57	this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
58	}
59	}
60	catch (Exception e)
61	{
62	Console.WriteLine(e.Message);
63	}
64	}
65
66	m_pos = value;
67	}
68	}
69
70	/// <summary>
71	/// Creates a new Entity (should not occur on it's own)
72	/// </summary>
73	public Entity()
74	{
75	uuid = new libsecondlife.LLUUID();
76	localid = 0;
77	m_pos = new LLVector3();
78	velocity = new LLVector3();
79	rotation = new Quaternion();
80	m_name = "(basic entity)";
81	children = new List<Entity>();
82	}
83
84	/// <summary>
85	///
86	/// </summary>
87	public virtual void addForces()
88	{
89	foreach (Entity child in children)
90	{
91	child.addForces();
92	}
93	}
94
95	/// <summary>
96	/// Performs any updates that need to be done at each frame. This function is overridable from it's children.
97	/// </summary>
98	public virtual void update() {
99	// Do any per-frame updates needed that are applicable to every type of entity
100	foreach (Entity child in children)
101	{
102	child.update();
103	}
104	}
105
106	/// <summary>
107	/// Returns a mesh for this object and any dependents
108	/// </summary>
109	/// <returns>The mesh of this entity tree</returns>
110	public virtual Mesh getMesh()
111	{
112	Mesh mesh = new Mesh();
113
114	foreach (Entity child in children)
115	{
116	mesh += child.getMesh();
117	}
118
119	return mesh;
120	}
121
122	/// <summary>
123	/// Called at a set interval to inform entities that they should back themsleves up to the DB
124	/// </summary>
125	public virtual void BackUp()
126	{
127
128	}
129
130	/// <summary>
131	/// Infoms the entity that the land (heightmap) has changed
132	/// </summary>
133	public virtual void LandRenegerated()
134	{
135
136	}
137	}
138	}