Megapatch. Completely remove the multiparameter IM methods. Remove the insecure

fromAgentSession field.

1 files changed, 13 insertions, 7 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3aa3fea..3933cf7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4030,13 +4030,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     if (handlerInstantMessage != null)
                     {
-                        handlerInstantMessage(this, msgpack.AgentData.AgentID, msgpack.AgentData.SessionID,
-                                              msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID,
-                                              msgpack.MessageBlock.Timestamp, IMfromName, IMmessage,
-                                              msgpack.MessageBlock.Dialog, msgpack.MessageBlock.FromGroup,
-                                              msgpack.MessageBlock.Offline, msgpack.MessageBlock.ParentEstateID,
-                                              msgpack.MessageBlock.Position, msgpack.MessageBlock.RegionID,
-                                              msgpack.MessageBlock.BinaryBucket);
+                        GridInstantMessage im = new GridInstantMessage(Scene,
+                                msgpack.AgentData.AgentID,
+                                IMfromName,
+                                msgpack.MessageBlock.ToAgentID,
+                                msgpack.MessageBlock.Dialog,
+                                msgpack.MessageBlock.FromGroup,
+                                IMmessage,
+                                msgpack.MessageBlock.ID,
+                                msgpack.MessageBlock.Offline != 0 ? true : false,
+                                msgpack.MessageBlock.Position,
+                                msgpack.MessageBlock.BinaryBucket);
+
+                        handlerInstantMessage(this, im);
                     }
                     break;