From bdab40280b64e31b763a99f6c2011e7e91e7d0fa Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 8 Jul 2007 03:32:27 +0000
Subject: * Added instant message support for the local region. Grid support
 forthcoming.

---
 OpenSim/Region/ClientStack/ClientView.API.cs       | 25 ++++++++++++++++++++++
 .../ClientStack/ClientView.ProcessPackets.cs       | 14 ++++++++++++
 .../Environment/Scenes/Scene.PacketHandlers.cs     | 24 +++++++++++++++++++++
 OpenSim/Region/Environment/Scenes/Scene.cs         |  1 +
 4 files changed, 64 insertions(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 9e7117f..cefe856 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -40,6 +40,7 @@ namespace OpenSim.Region.ClientStack
 {
     partial class ClientView
     {
+        public event ImprovedInstantMessage OnInstantMessage;
         public event ChatFromViewer OnChatFromViewer;
         public event RezObject OnRezObject;
         public event GenericCall4 OnDeRezObject;
@@ -236,6 +237,30 @@ namespace OpenSim.Region.ClientStack
             this.OutPacket(reply);
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>TODO</remarks>
+        /// <param name="message"></param>
+        /// <param name="target"></param>
+        public void SendInstantMessage(string message, LLUUID target)
+        {
+            ImprovedInstantMessagePacket msg = new ImprovedInstantMessagePacket();
+            msg.AgentData.AgentID = this.AgentID;
+            msg.AgentData.SessionID = this.SessionID;
+
+            msg.MessageBlock.Dialog = 0;
+            msg.MessageBlock.FromGroup = false;
+            msg.MessageBlock.ID = target.Combine(this.AgentID);
+            msg.MessageBlock.Offline = 0;
+            msg.MessageBlock.ParentEstateID = 0;
+            msg.MessageBlock.Position = new LLVector3();
+            msg.MessageBlock.RegionID = new LLUUID();
+            msg.MessageBlock.Timestamp = 0;
+            msg.MessageBlock.ToAgentID = target;
+
+            this.OutPacket(msg);
+        }
 
         /// <summary>
         ///  Send the region heightmap to the client
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 0114fb1..def14c7 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -92,6 +92,20 @@ namespace OpenSim.Region.ClientStack
                             this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
                         }
                         break;
+                    case PacketType.ImprovedInstantMessage:
+                        ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
+
+                        string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
+                        string IMmessage = Util.FieldToString(msgpack.MessageBlock.Message);
+
+                        if (OnInstantMessage != null)
+                        {
+                            this.OnInstantMessage(msgpack.AgentData.AgentID, msgpack.MessageBlock.ToAgentID,
+                                msgpack.MessageBlock.Timestamp, IMfromName, IMmessage);
+                        }
+
+                        break;
+
                     case PacketType.RezObject:
                         RezObjectPacket rezPacket = (RezObjectPacket)Pack;
                         AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index bcef137..7535049 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -100,6 +100,30 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// 
         /// </summary>
+        /// <remarks>Inefficient. TODO: Fixme</remarks>
+        /// <param name="fromAgentID"></param>
+        /// <param name="toAgentID"></param>
+        /// <param name="timestamp"></param>
+        /// <param name="fromAgentName"></param>
+        /// <param name="message"></param>
+        public void InstantMessage(LLUUID fromAgentID, LLUUID toAgentID, uint timestamp, string fromAgentName, string message)
+        {
+            if (this.Avatars.ContainsKey(toAgentID))
+            {
+                // Local sim message
+                ScenePresence avatar = this.Avatars[toAgentID];
+
+                
+            }
+            else
+            {
+                // Grid message
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
         /// <param name="message"></param>
         /// <param name="type"></param>
         /// <param name="fromPos"></param>
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1f370c4..fdf3cc8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -450,6 +450,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnRegionHandShakeReply += this.SendLayerData;
             //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
             client.OnChatFromViewer += this.SimChat;
+            client.OnInstantMessage += this.InstantMessage;
             client.OnRequestWearables += this.InformClientOfNeighbours;
             client.OnAddPrim += this.AddNewPrim;
             client.OnUpdatePrimPosition += this.UpdatePrimPosition;
-- 
cgit v1.1