diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 340472c..d24b54d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1106,7 +1106,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1106 | { | 1106 | { |
1107 | SendInstantMessage( | 1107 | SendInstantMessage( |
1108 | fromAgent, fromAgentSession, message, toAgent, | 1108 | fromAgent, fromAgentSession, message, toAgent, |
1109 | imSessionID, fromName, dialog, timeStamp, new byte[0]); | 1109 | imSessionID, fromName, dialog, timeStamp, false, new byte[0]); |
1110 | } | 1110 | } |
1111 | 1111 | ||
1112 | /// <summary> | 1112 | /// <summary> |
@@ -1116,7 +1116,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1116 | /// <param name="target"></param> | 1116 | /// <param name="target"></param> |
1117 | public void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, | 1117 | public void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, |
1118 | UUID imSessionID, string fromName, byte dialog, uint timeStamp, | 1118 | UUID imSessionID, string fromName, byte dialog, uint timeStamp, |
1119 | byte[] binaryBucket) | 1119 | bool fromGroup, byte[] binaryBucket) |
1120 | { | 1120 | { |
1121 | if (((Scene)(this.m_scene)).ExternalChecks.ExternalChecksCanInstantMessage(fromAgent, toAgent)) | 1121 | if (((Scene)(this.m_scene)).ExternalChecks.ExternalChecksCanInstantMessage(fromAgent, toAgent)) |
1122 | { | 1122 | { |
@@ -1127,7 +1127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1127 | msg.AgentData.SessionID = fromAgentSession; | 1127 | msg.AgentData.SessionID = fromAgentSession; |
1128 | msg.MessageBlock.FromAgentName = Utils.StringToBytes(fromName); | 1128 | msg.MessageBlock.FromAgentName = Utils.StringToBytes(fromName); |
1129 | msg.MessageBlock.Dialog = dialog; | 1129 | msg.MessageBlock.Dialog = dialog; |
1130 | msg.MessageBlock.FromGroup = false; | 1130 | msg.MessageBlock.FromGroup = fromGroup; |
1131 | msg.MessageBlock.ID = imSessionID; | 1131 | msg.MessageBlock.ID = imSessionID; |
1132 | msg.MessageBlock.Offline = 0; | 1132 | msg.MessageBlock.Offline = 0; |
1133 | msg.MessageBlock.ParentEstateID = 0; | 1133 | msg.MessageBlock.ParentEstateID = 0; |
@@ -4089,6 +4089,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4089 | break; | 4089 | break; |
4090 | case PacketType.ImprovedInstantMessage: | 4090 | case PacketType.ImprovedInstantMessage: |
4091 | ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; | 4091 | ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; |
4092 | Console.WriteLine(msgpack.ToString()); | ||
4092 | string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); | 4093 | string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); |
4093 | string IMmessage = Utils.BytesToString(msgpack.MessageBlock.Message); | 4094 | string IMmessage = Utils.BytesToString(msgpack.MessageBlock.Message); |
4094 | handlerInstantMessage = OnInstantMessage; | 4095 | handlerInstantMessage = OnInstantMessage; |