Merge branch 'avination' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs

1 files changed, 7 insertions, 0 deletions

diff --git a/OpenSim/Framework/OSChatMessage.cs b/OpenSim/Framework/OSChatMessage.cs
index 54fa275..7450be2 100644
--- a/OpenSim/Framework/OSChatMessage.cs
+++ b/OpenSim/Framework/OSChatMessage.cs
@@ -51,6 +51,7 @@ namespace OpenSim.Framework
         protected object m_senderObject;
         protected ChatTypeEnum m_type;
         protected UUID m_fromID;
+        protected UUID m_destination = UUID.Zero;
 
         public OSChatMessage()
         {
@@ -131,6 +132,12 @@ namespace OpenSim.Framework
             set { m_fromID = value; }
         }
 
+        public UUID Destination
+        {
+            get { return m_destination; }
+            set { m_destination = value; }
+        }
+
         /// <summary>
         ///
         /// </summary>