* Instant Message functionality moved into a Region Modules

* You can now send instant messages to any user on the simulator, regardless of what region they are in.

2 files changed, 1 insertions, 36 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 43a9d86..df8b190 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -60,40 +60,6 @@ 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 fromAgentSession, LLUUID toAgentID, LLUUID imSessionID,
-                                   uint timestamp, string fromAgentName, string message, byte dialog)
-        {
-            if (m_scenePresences.ContainsKey(toAgentID))
-            {
-                if (m_scenePresences.ContainsKey(fromAgentID))
-                {
-                    // Local sim message
-                    ScenePresence fromAvatar = m_scenePresences[fromAgentID];
-                    ScenePresence toAvatar = m_scenePresences[toAgentID];
-                    string fromName = fromAvatar.Firstname + " " + fromAvatar.Lastname;
-                    toAvatar.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, toAgentID,
-                                                                  imSessionID, fromName, dialog, timestamp);
-                }
-                else
-                {
-                    // Message came from a user outside the sim, ignore?
-                }
-            }
-            else
-            {
-                // Grid message
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
         /// <param name="message"></param>
         /// <param name="type"></param>
         /// <param name="fromPos"></param>
@@ -531,4 +497,4 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 83432d4..ab94842 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -739,7 +739,6 @@ namespace OpenSim.Region.Environment.Scenes
             //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
             client.OnModifyTerrain += ModifyTerrain;
             //client.OnChatFromViewer += SimChat;
-            client.OnInstantMessage += InstantMessage;
             client.OnRequestWearables += InformClientOfNeighbours;
             client.OnAddPrim += AddNewPrim;
             client.OnUpdatePrimGroupPosition += UpdatePrimPosition;