* 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.*

26 files changed, 64 insertions, 72 deletions

diff --git a/OpenSim/Framework/AssetRequestToClient.cs b/OpenSim/Framework/AssetRequestToClient.cs
index 2bf3d3e..6e935e8 100644
--- a/OpenSim/Framework/AssetRequestToClient.cs
+++ b/OpenSim/Framework/AssetRequestToClient.cs
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index e1d0bbe..74a9f92 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -28,13 +28,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
-using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
-using OpenSim.Framework;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 0515aeb..260d6cf 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using OpenSim.Framework;
 
 namespace OpenSim.Framework
 {
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
 {
diff --git a/OpenSim/Framework/ColliderData.cs b/OpenSim/Framework/ColliderData.cs
index 4e94d6d..51ab5a8 100644
--- a/OpenSim/Framework/ColliderData.cs
+++ b/OpenSim/Framework/ColliderData.cs
@@ -26,9 +26,8 @@
  */
 
 using System;
-using System.Collections;
-using OpenMetaverse;
 using System.Collections.Generic;
+using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 1a24711..02b8465 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -25,10 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Framework
 {
     public class ConfigSettings
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 2a2b9b2..bbfe28d 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -31,8 +31,8 @@ using System.Globalization;
 using System.Net;
 using System.Reflection;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework
diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index 4d31514..5c3aa42 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -26,9 +26,6 @@
  */
 
 using OpenMetaverse;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index f8595e0..81f85cd 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -26,11 +26,9 @@
  */
 
 using System;
-using System.IO;
-using System.Reflection;
 using System.Collections.Generic;
+using System.IO;
 using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/EventData.cs b/OpenSim/Framework/EventData.cs
index 70554d0..a7d3260 100644
--- a/OpenSim/Framework/EventData.cs
+++ b/OpenSim/Framework/EventData.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
diff --git a/OpenSim/Framework/FriendRegionInfo.cs b/OpenSim/Framework/FriendRegionInfo.cs
index 04e00e8..ee308ea 100644
--- a/OpenSim/Framework/FriendRegionInfo.cs
+++ b/OpenSim/Framework/FriendRegionInfo.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-
 namespace OpenSim.Framework
 {
     public class FriendRegionInfo
diff --git a/OpenSim/Framework/GroupData.cs b/OpenSim/Framework/GroupData.cs
index 3b980e7..8b8c6e0 100644
--- a/OpenSim/Framework/GroupData.cs
+++ b/OpenSim/Framework/GroupData.cs
@@ -26,11 +26,7 @@
  */
 
 
-using System;
-using System.Collections;
 using OpenMetaverse;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4759761..0e88dbd 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -638,7 +638,6 @@ namespace OpenSim.Framework
         /// <summary>
         /// Tell this client what items it should be wearing now
         /// </summary>
-        /// <param name="wearables"></param>        
         void SendWearables(AvatarWearable[] wearables, int serial);
         
         /// <summary>
@@ -660,15 +659,18 @@ namespace OpenSim.Framework
         
         void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId);
         void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
-        void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
-        void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
 
-        void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
-                                UUID imSessionID, string fromName, byte dialog, uint timeStamp);
+        void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
+                             byte audible);
 
-        void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
-                                UUID imSessionID, string fromName, byte dialog, uint timeStamp,
-                                bool fromGroup, byte[] binaryBucket);
+        void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
+                             byte audible);
+
+        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);
 
         void SendGenericMessage(string method, List<string> message);
 
@@ -833,7 +835,6 @@ namespace OpenSim.Framework
         /// <summary>
         /// Tell the client that the requested texture cannot be found
         /// </summary>
-        /// <param name="imageId"></param>
         void SendImageNotFound(UUID imageid);
 
         void SendShutdownConnectionNotice();
@@ -880,7 +881,6 @@ namespace OpenSim.Framework
         /// <summary>
         /// Set the debug level at which packet output should be printed to console.
         /// </summary>
-        /// <param name="newDebugPacketLevel"></param>
         void SetDebugPacketLevel(int newDebug);
         
         void InPacket(object NewPack);
@@ -892,7 +892,7 @@ namespace OpenSim.Framework
         event Action<IClientAPI> OnLogout;
         event Action<IClientAPI> OnConnectionClosed;
 
-        void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message);
+        void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
 
         void SendLogoutPacket();
         ClientInfo GetClientInfo();
diff --git a/OpenSim/Framework/LandStatReportItem.cs b/OpenSim/Framework/LandStatReportItem.cs
index b3ad02a..e93dda9 100644
--- a/OpenSim/Framework/LandStatReportItem.cs
+++ b/OpenSim/Framework/LandStatReportItem.cs
@@ -26,12 +26,8 @@
  */
 
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
 
-
 namespace OpenSim.Framework
 {
     public class LandStatReportItem
diff --git a/OpenSim/Framework/MapItemReplyStruct.cs b/OpenSim/Framework/MapItemReplyStruct.cs
index f088085..3b3107b 100644
--- a/OpenSim/Framework/MapItemReplyStruct.cs
+++ b/OpenSim/Framework/MapItemReplyStruct.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
diff --git a/OpenSim/Framework/ParcelMediaCommandEnum.cs b/OpenSim/Framework/ParcelMediaCommandEnum.cs
index 644c6ee..93c41ec 100644
--- a/OpenSim/Framework/ParcelMediaCommandEnum.cs
+++ b/OpenSim/Framework/ParcelMediaCommandEnum.cs
@@ -25,10 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Framework
 {
     public enum ParcelMediaCommandEnum
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index a39f787..497d9f5 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -26,14 +26,12 @@
  */
 
 using System;
-using System.IO;
-using System.Xml;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using log4net;
 using Mono.Addins;
 
-
 namespace OpenSim.Framework
 {
     /// <summary>
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 49bc953..cd50e9e 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -28,8 +28,8 @@
 using System;
 using System.Reflection;
 using System.Xml.Serialization;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/ProxyCodec.cs b/OpenSim/Framework/ProxyCodec.cs
index e1aeeda..df4be64 100644
--- a/OpenSim/Framework/ProxyCodec.cs
+++ b/OpenSim/Framework/ProxyCodec.cs
@@ -26,10 +26,7 @@
  */
 
 using System;
-using System.Collections;
 using System.Net;
-using OpenMetaverse;
-using OpenMetaverse.Packets;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 34a69d7..cac68d9 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -26,12 +26,11 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Xml;
-using OpenMetaverse;
 using Nini.Config;
+using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index ba04513..e1e747a 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -27,9 +27,7 @@
 
 using System;
 using System.IO;
-using System.Reflection;
 using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/SurfaceTouchEventArgs.cs b/OpenSim/Framework/SurfaceTouchEventArgs.cs
index ae85197..5d4802a 100644
--- a/OpenSim/Framework/SurfaceTouchEventArgs.cs
+++ b/OpenSim/Framework/SurfaceTouchEventArgs.cs
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 16ea042..4a1aa17 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -27,12 +27,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
 using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index fdb1137..1443e74 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -26,13 +26,7 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
 using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 122f104..7caa414 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -39,10 +39,10 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 
 namespace OpenSim.Framework
 {