From d6301db382111bf57a7893215ea84b7e6b09187e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 2 Oct 2009 00:45:31 +0100
Subject: Revert "* Adding Scale to EntityBase * Fixing the incorrect
 initialization of EntityBase.Rotation * Removed
 SceneObjectGroup.GroupRotation and added overrides for
 Scale/Rotation/Velocity"

This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
---
 OpenSim/Region/Framework/Scenes/EntityBase.cs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/EntityBase.cs')

diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 27a0785..c2ec6a5 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_velocity = value; }
         }
 
-        protected Quaternion m_rotation;
+        protected Quaternion m_rotation = new Quaternion(0f, 0f, 1f, 0f);
 
         public virtual Quaternion Rotation
         {
@@ -102,14 +102,6 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_rotation = value; }
         }
 
-        protected Vector3 m_scale;
-
-        public virtual Vector3 Scale
-        {
-            get { return m_scale; }
-            set { m_scale = value; }
-        }
-
         protected uint m_localId;
 
         public virtual uint LocalId
@@ -123,9 +115,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public EntityBase()
         {
-            m_rotation = Quaternion.Identity;
-            m_scale = Vector3.One;
+            m_uuid = UUID.Zero;
+
+            m_pos = Vector3.Zero;
+            m_velocity = Vector3.Zero;
+            Rotation = Quaternion.Identity;
             m_name = "(basic entity)";
+            m_rotationalvelocity = Vector3.Zero;
         }
 
         /// <summary>
-- 
cgit v1.1