Instant Messages between users in the same region should actually now work.

1 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index a6cb281..903ddcc 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -121,14 +121,12 @@ namespace OpenSim.Region.ClientStack
                         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);
+                            this.OnInstantMessage(msgpack.AgentData.AgentID, msgpack.AgentData.SessionID, msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID,
+                                msgpack.MessageBlock.Timestamp, IMfromName, IMmessage, msgpack.MessageBlock.Dialog);
                         }
                         break;
                     case PacketType.RezObject:
@@ -235,7 +233,6 @@ namespace OpenSim.Region.ClientStack
                         {
                             ObjectAddPacket addPacket = (ObjectAddPacket)Pack;
                             PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket);
-
                             OnAddPrim(this.AgentId, addPacket.ObjectData.RayEnd, shape);
                         }
                         break;
@@ -460,9 +457,12 @@ namespace OpenSim.Region.ClientStack
                         }
                         break;
                     case PacketType.UpdateTaskInventory:
-                        // Console.WriteLine(Pack.ToString());
+                         //Console.WriteLine(Pack.ToString());
                         UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
                         break;
+                    case PacketType.RezScript:
+                        //Console.WriteLine(Pack.ToString());
+                        break;
                     case PacketType.MapLayerRequest:
                         this.RequestMapLayer();
                         break;