a few changes cosmetic changes around OSChatMessage...

OpenSim/Framework/OSChatMessage.cs

@@ -30,128 +30,56 @@ using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
-    public interface IEventArgs
-    {
-        IScene Scene { get; set; }
-        IClientAPI Sender { get; set; }
-    }
-
     /// <summary>
     /// ChatFromViewer Arguments
     /// </summary>
-    public class OSChatMessage : EventArgs, IEventArgs
+    public class OSChatMessage : EventArgs
     {
-        protected int m_channel;
-        protected string m_from;
-        protected string m_message;
-        protected Vector3 m_position;
-
-        protected IScene m_scene;
-        protected IClientAPI m_sender;
-        protected object m_senderObject;
-        protected ChatTypeEnum m_type;
-        protected UUID m_fromID;
-        protected UUID m_destination = UUID.Zero;
-
-        public OSChatMessage()
-        {
-            m_position = new Vector3();
-        }
-
-        /// <summary>
-        /// The message sent by the user
-        /// </summary>
-        public string Message
-        {
-            get { return m_message; }
-            set { m_message = value; }
-        }
-
         /// <summary>
         /// The type of message, eg say, shout, broadcast.
         /// </summary>
-        public ChatTypeEnum Type
-        {
-            get { return m_type; }
-            set { m_type = value; }
-        }
+        public ChatTypeEnum Type { get; set; }
 
         /// <summary>
         /// Which channel was this message sent on? Different channels may have different listeners. Public chat is on channel zero.
         /// </summary>
-        public int Channel
-        {
-            get { return m_channel; }
-            set { m_channel = value; }
-        }
-
-        /// <summary>
-        /// The position of the sender at the time of the message broadcast.
-        /// </summary>
-        public Vector3 Position
-        {
-            get { return m_position; }
-            set { m_position = value; }
-        }
+        public int Channel { get; set; }
 
         /// <summary>
         /// The name of the sender (needed for scripts)
         /// </summary>
-        public string From
-        {
-            get { return m_from; }
-            set { m_from = value; }
-        }
+        public string From { get; set; }
 
-        #region IEventArgs Members
+        /// <summary>
+        /// The message sent by the user
+        /// </summary>
+        public string Message { get; set; }
 
-        /// TODO: Sender and SenderObject should just be Sender and of
-        /// type IChatSender
+        /// <summary>
+        /// The position of the sender at the time of the message broadcast.
+        /// </summary>
+        public Vector3 Position { get; set; }
 
         /// <summary>
         /// The client responsible for sending the message, or null.
         /// </summary>
-        public IClientAPI Sender
-        {
-            get { return m_sender; }
-            set { m_sender = value; }
-        }
-
+        public IClientAPI Sender { get; set; }
         /// <summary>
         /// The object responsible for sending the message, or null.
         /// </summary>
-        public object SenderObject
-        {
-            get { return m_senderObject; }
-            set { m_senderObject = value; }
-        }
+        public object SenderObject { get; set; }
 
-        public UUID SenderUUID
-        {
-            get { return m_fromID; }
-            set { m_fromID = value; }
-        }
+        public UUID SenderUUID { get; set; }
+        public UUID Destination { get; set; }
+        public IScene Scene { get; set; }
 
-        public UUID Destination
+        public OSChatMessage()
         {
-            get { return m_destination; }
-            set { m_destination = value; }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public IScene Scene
-        {
-            get { return m_scene; }
-            set { m_scene = value; }
         }
 
         public override string ToString()
         {
-            return m_message;
+            return Message;
         }
-
-        #endregion
     }
 }