* Added IClientIM to IClientCore interfaces

* Changed SendInstantMessage, dropped fromAgentSession and imSessionID as security precaution, see http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide for details on porting.
* Removed unused usings from Framework.*

2 files changed, 46 insertions, 1 deletions

diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs
new file mode 100644
index 0000000..a3498c2
--- /dev/null
+++ b/OpenSim/Framework/Client/IClientIM.cs
@@ -0,0 +1,45 @@
+using System;

+using OpenMetaverse;

+

+namespace OpenSim.Framework.Client

+{

+    public class ClientInstantMessageArgs : EventArgs

+    {

+        public IClientCore client;

+        public string message;

+        public DateTime time;

+        public ClientInstantMessageSender sender;

+    }

+

+    public class ClientInstantMessageSender

+    {

+        public UUID ID;

+        public bool online;

+        public string name;

+        public Vector3 position;

+        public UUID regionID;

+    }

+

+    public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e);

+

+    public class ClientInstantMessageParms

+    {

+        public ClientInstantMessageSender senderInfo;

+    }

+

+    // Porting Guide from old IM

+    // SendIM(...)

+    //      Loses FromAgentSession - this should be added by implementers manually.

+    //      

+

+    public interface IClientIM

+    {

+        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,

+                        string fromName, byte dialog, uint timeStamp);

+

+        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,

+                                string fromName, byte dialog, uint timeStamp,

+                                bool fromGroup, byte[] binaryBucket);

+        event ImprovedInstantMessage OnInstantMessage;

+    }

+}

diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 3f83f5c..1bb9836 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
-using log4net;
 
 namespace OpenSim.Framework
 {