* Rolled back a few changes.

1 files changed, 97 insertions, 96 deletions

diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 7e43718..11bafb7 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -36,83 +36,23 @@ namespace OpenSim.Region.Environment.Scenes
     [Serializable]
     public abstract class EntityBase : ISerializable
     {
-        protected uint m_localId;
-        protected string m_name;
-        protected LLVector3 m_pos;
-        protected Quaternion m_rotation = new Quaternion(0, 0, 1, 0);
-        protected LLVector3 m_rotationalvelocity;
         protected Scene m_scene;
-
-        protected LLUUID m_uuid;
-        protected LLVector3 m_velocity;
-
-        /// <summary>
-        /// Creates a new Entity (should not occur on it's own)
-        /// </summary>
-        public EntityBase()
-        {
-            m_uuid = LLUUID.Zero;
-
-            m_pos = new LLVector3();
-            m_velocity = new LLVector3();
-            Rotation = new Quaternion();
-            m_name = "(basic entity)";
-            m_rotationalvelocity = new LLVector3(0, 0, 0);
-        }
-
-        protected EntityBase(SerializationInfo info, StreamingContext context)
-        {
-            //System.Console.WriteLine("EntityBase Deserialize BGN");
-
-            if (info == null)
-            {
-                throw new ArgumentNullException("info");
-            }
-
-            m_uuid = new LLUUID((Guid) info.GetValue("m_uuid", typeof (Guid)));
-            m_name = (string) info.GetValue("m_name", typeof (string));
-
-            m_pos
-                = new LLVector3(
-                    (float) info.GetValue("m_pos.X", typeof (float)),
-                    (float) info.GetValue("m_pos.Y", typeof (float)),
-                    (float) info.GetValue("m_pos.Z", typeof (float)));
-
-            m_velocity
-                = new LLVector3(
-                    (float) info.GetValue("m_velocity.X", typeof (float)),
-                    (float) info.GetValue("m_velocity.Y", typeof (float)),
-                    (float) info.GetValue("m_velocity.Z", typeof (float)));
-
-            m_rotationalvelocity
-                = new LLVector3(
-                    (float) info.GetValue("m_rotationalvelocity.X", typeof (float)),
-                    (float) info.GetValue("m_rotationalvelocity.Y", typeof (float)),
-                    (float) info.GetValue("m_rotationalvelocity.Z", typeof (float)));
-
-            m_rotation
-                = new Quaternion(
-                    (float) info.GetValue("m_rotation.w", typeof (float)),
-                    (float) info.GetValue("m_rotation.x", typeof (float)),
-                    (float) info.GetValue("m_rotation.y", typeof (float)),
-                    (float) info.GetValue("m_rotation.z", typeof (float)));
-
-            m_localId = (uint) info.GetValue("m_localId", typeof (uint));
-
-            //System.Console.WriteLine("EntityBase Deserialize END");
-        }
-
+        
         public Scene Scene
         {
             get { return m_scene; }
         }
 
+        protected LLUUID m_uuid;
+
         public virtual LLUUID UUID
         {
             get { return m_uuid; }
             set { m_uuid = value; }
         }
 
+        protected string m_name;
+
         /// <summary>
         /// 
         /// </summary>
@@ -122,6 +62,8 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_name = value; }
         }
 
+        protected LLVector3 m_pos;
+
         /// <summary>
         /// 
         /// </summary>
@@ -131,6 +73,9 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_pos = value; }
         }
 
+        protected LLVector3 m_velocity;
+        protected LLVector3 m_rotationalvelocity;
+
         /// <summary>
         /// 
         /// </summary>
@@ -140,24 +85,104 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_velocity = value; }
         }
 
+        protected Quaternion m_rotation = new Quaternion(0, 0, 1, 0);
+
         public virtual Quaternion Rotation
         {
             get { return m_rotation; }
             set { m_rotation = value; }
         }
 
+        protected uint m_localId;
+
         public virtual uint LocalId
         {
             get { return m_localId; }
             set { m_localId = value; }
         }
 
-        #region ISerializable Members
+        /// <summary>
+        /// Creates a new Entity (should not occur on it's own)
+        /// </summary>
+        public EntityBase()
+        {
+            m_uuid = LLUUID.Zero;
+
+            m_pos = new LLVector3();
+            m_velocity = new LLVector3();
+            Rotation = new Quaternion();
+            m_name = "(basic entity)";
+            m_rotationalvelocity = new LLVector3(0, 0, 0);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public abstract void UpdateMovement();
+
+        /// <summary>
+        /// Performs any updates that need to be done at each frame.
+        /// </summary>
+        public abstract void Update();
+
+        /// <summary>
+        /// Copies the entity
+        /// </summary>
+        /// <returns></returns>
+        public virtual EntityBase Copy()
+        {
+            return (EntityBase) MemberwiseClone();
+        }
+
+
+        public abstract void SetText(string text, Vector3 color, double alpha);
+
+        protected EntityBase(SerializationInfo info, StreamingContext context)
+        {
+            //System.Console.WriteLine("EntityBase Deserialize BGN");
+
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            m_uuid = new LLUUID((Guid)info.GetValue("m_uuid", typeof(Guid)));
+            m_name = (string)info.GetValue("m_name", typeof(string));
+
+            m_pos
+                = new LLVector3(
+                        (float)info.GetValue("m_pos.X", typeof(float)),
+                        (float)info.GetValue("m_pos.Y", typeof(float)),
+                        (float)info.GetValue("m_pos.Z", typeof(float)));
+
+            m_velocity
+                = new LLVector3(
+                        (float)info.GetValue("m_velocity.X", typeof(float)),
+                        (float)info.GetValue("m_velocity.Y", typeof(float)),
+                        (float)info.GetValue("m_velocity.Z", typeof(float)));
+
+            m_rotationalvelocity
+                = new LLVector3(
+                        (float)info.GetValue("m_rotationalvelocity.X", typeof(float)),
+                        (float)info.GetValue("m_rotationalvelocity.Y", typeof(float)),
+                        (float)info.GetValue("m_rotationalvelocity.Z", typeof(float)));
+
+            m_rotation
+                = new Quaternion(
+                        (float)info.GetValue("m_rotation.w", typeof(float)),
+                        (float)info.GetValue("m_rotation.x", typeof(float)),
+                        (float)info.GetValue("m_rotation.y", typeof(float)),
+                        (float)info.GetValue("m_rotation.z", typeof(float)));
+
+            m_localId = (uint)info.GetValue("m_localId", typeof(uint));
+
+            //System.Console.WriteLine("EntityBase Deserialize END");
+        }
 
         [SecurityPermission(SecurityAction.LinkDemand,
             Flags = SecurityPermissionFlag.SerializationFormatter)]
         public virtual void GetObjectData(
-            SerializationInfo info, StreamingContext context)
+                        SerializationInfo info, StreamingContext context)
         {
             if (info == null)
             {
@@ -190,42 +215,18 @@ namespace OpenSim.Region.Environment.Scenes
 
             info.AddValue("m_localId", m_localId);
         }
-
-        #endregion
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public abstract void UpdateMovement();
-
-        /// <summary>
-        /// Performs any updates that need to be done at each frame.
-        /// </summary>
-        public abstract void Update();
-
-        /// <summary>
-        /// Copies the entity
-        /// </summary>
-        /// <returns></returns>
-        public virtual EntityBase Copy()
-        {
-            return (EntityBase) MemberwiseClone();
-        }
-
-
-        public abstract void SetText(string text, Vector3 color, double alpha);
     }
 
     //Nested Classes
     public class EntityIntersection
     {
-        public Vector3 AAfaceNormal = new Vector3(0, 0, 0);
-        public float distance;
-        public int face = -1;
-        public bool HitTF;
         public Vector3 ipoint = new Vector3(0, 0, 0);
         public Vector3 normal = new Vector3(0, 0, 0);
+        public Vector3 AAfaceNormal = new Vector3(0, 0, 0);
+        public int face = -1;
+        public bool HitTF = false;
         public SceneObjectPart obj;
+        public float distance = 0;
 
         public EntityIntersection()
         {
@@ -238,4 +239,4 @@ namespace OpenSim.Region.Environment.Scenes
             HitTF = _HitTF;
         }
     }
-}
\ No newline at end of file
+}