1 files changed, 5 insertions, 80 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index db5070d..9603f7f 100644
--- a/OpenSim/Region/Environment/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -34,29 +34,14 @@ using libsecondlife;
 namespace OpenSim.Region.Environment.Scenes
 {
-    public abstract class Entity
+    public abstract class Entity :EntityBase //will be phased out 
-    {
+    {     
-        public libsecondlife.LLUUID uuid;
-        public Quaternion rotation;
-        protected List<Entity> children;
-        
        protected PhysicsActor _physActor;
-        protected Scene m_world;
-        protected string m_name;
        /// <summary>
        /// 
        /// </summary>
-        public virtual string Name
+        public override LLVector3 Pos
-        {
-            get { return m_name; }
-        }
-        protected LLVector3 m_pos;
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual LLVector3 Pos
        {
            get
            {
@@ -91,12 +76,11 @@ namespace OpenSim.Region.Environment.Scenes
            }
        }
-        public LLVector3 velocity;
+       
        /// <summary>
        /// 
        /// </summary>
-        public virtual LLVector3 Velocity
+        public override LLVector3 Velocity
        {
            get
            {
@@ -130,64 +114,5 @@ namespace OpenSim.Region.Environment.Scenes
                velocity = value;
            }
        }
-        protected uint m_localId;
-        public uint LocalId
-        {
-            get { return m_localId; }
-        }
-        /// <summary>
-        /// Creates a new Entity (should not occur on it's own)
-        /// </summary>
-        public Entity()
-        {
-            uuid = new libsecondlife.LLUUID();
-            m_pos = new LLVector3();
-            velocity = new LLVector3();
-            rotation = new Quaternion();
-            m_name = "(basic entity)";
-            children = new List<Entity>();
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual void updateMovement()
-        {
-                foreach (Entity child in children)
-            {
-                child.updateMovement();
-            }
-        }
-        /// <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>
-        /// 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/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs index db5070d..9603f7f 100644 --- a/OpenSim/Region/Environment/Scenes/Entity.cs +++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -34,29 +34,14 @@ using libsecondlife;
34		34
35	namespace OpenSim.Region.Environment.Scenes	35	namespace OpenSim.Region.Environment.Scenes
36	{	36	{
37	public abstract class Entity	37	public abstract class Entity :EntityBase //will be phased out
38	{	38	{
39	public libsecondlife.LLUUID uuid;
40	public Quaternion rotation;
41	protected List<Entity> children;
42
43	protected PhysicsActor _physActor;	39	protected PhysicsActor _physActor;
44	protected Scene m_world;
45	protected string m_name;
46		40
47	/// <summary>	41	/// <summary>
48	///	42	///
49	/// </summary>	43	/// </summary>
50	public virtual string Name	44	public override LLVector3 Pos
51	{
52	get { return m_name; }
53	}
54
55	protected LLVector3 m_pos;
56	/// <summary>
57	///
58	/// </summary>
59	public virtual LLVector3 Pos
60	{	45	{
61	get	46	get
62	{	47	{
@@ -91,12 +76,11 @@ namespace OpenSim.Region.Environment.Scenes
91	}	76	}
92	}	77	}
93		78
94	public LLVector3 velocity;	79
95
96	/// <summary>	80	/// <summary>
97	///	81	///
98	/// </summary>	82	/// </summary>
99	public virtual LLVector3 Velocity	83	public override LLVector3 Velocity
100	{	84	{
101	get	85	get
102	{	86	{
@@ -130,64 +114,5 @@ namespace OpenSim.Region.Environment.Scenes
130	velocity = value;	114	velocity = value;
131	}	115	}
132	}	116	}
133
134	protected uint m_localId;
135
136	public uint LocalId
137	{
138	get { return m_localId; }
139	}
140
141	/// <summary>
142	/// Creates a new Entity (should not occur on it's own)
143	/// </summary>
144	public Entity()
145	{
146	uuid = new libsecondlife.LLUUID();
147
148	m_pos = new LLVector3();
149	velocity = new LLVector3();
150	rotation = new Quaternion();
151	m_name = "(basic entity)";
152	children = new List<Entity>();
153	}
154
155	/// <summary>
156	///
157	/// </summary>
158	public virtual void updateMovement()
159	{
160	foreach (Entity child in children)
161	{
162	child.updateMovement();
163	}
164	}
165
166	/// <summary>
167	/// Performs any updates that need to be done at each frame. This function is overridable from it's children.
168	/// </summary>
169	public virtual void update() {
170	// Do any per-frame updates needed that are applicable to every type of entity
171	foreach (Entity child in children)
172	{
173	child.update();
174	}
175	}
176
177	/// <summary>
178	/// Called at a set interval to inform entities that they should back themsleves up to the DB
179	/// </summary>
180	public virtual void BackUp()
181	{
182
183	}
184
185	/// <summary>
186	/// Infoms the entity that the land (heightmap) has changed
187	/// </summary>
188	public virtual void LandRenegerated()
189	{
190
191	}
192	}	117	}
193	}	118	}