* Applied Melanie's same instance IM fix. This will make IMs work within the same OpenSim Instance.

1 files changed, 4 insertions, 14 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1154fba..61a713a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -225,20 +225,10 @@ namespace OpenSim.Framework
 
     public delegate void ImprovedInstantMessage(
         LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp,
-        string fromAgentName, string message, byte dialog); // Cut down from full list
-
-    //rezPacket.RezData.BypassRaycast;
-    //rezPacket.RezData.RayEnd;
-    //rezPacket.RezData.RayEndIsIntersection;
-    //rezPacket.RezData.RayStart;
-    //rezPacket.RezData.RayTargetID;
-    //rezPacket.RezData.RemoveItem;
-    //rezPacket.RezData.RezSelected;
-    //rezPacket.RezData.FromTaskID;
-    //rezPacket.RezData.FromTaskID;
-    //rezPacket.RezData.EveryoneMask;
-    //rezPacket.RezData.GroupMask;
-    //rezPacket.RezData.NextOwnerMask;
+        string fromAgentName, string message, byte dialog, bool fromGroup, byte offline, uint ParentEstateID,
+        LLVector3 Position, LLUUID RegionID, byte[] binaryBucket); // This shouldn't be cut down...  
+        // especially if we're ever going to implement groups, presence, estate message dialogs...
+
     public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, LLVector3 RayStart,
                                     LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 
                                     uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,