aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-25 13:53:17 +0000
committerMelanie Thielker2008-10-25 13:53:17 +0000
commitc49e1b8fb67edb686038e6d200914ed3358bf649 (patch)
treeed9311fc50c19a90c65ce89fba0136155b564690
parentFixed the cause of a hidden Exception which prevented BaseHttpServer to answer (diff)
downloadopensim-SC_OLD-c49e1b8fb67edb686038e6d200914ed3358bf649.zip
opensim-SC_OLD-c49e1b8fb67edb686038e6d200914ed3358bf649.tar.gz
opensim-SC_OLD-c49e1b8fb67edb686038e6d200914ed3358bf649.tar.bz2
opensim-SC_OLD-c49e1b8fb67edb686038e6d200914ed3358bf649.tar.xz
A few more bots to yesterday's plumbing: change instant message method
signature
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
6 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f38b57f..471def5 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -656,7 +656,7 @@ namespace OpenSim.Framework
656 656
657 void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 657 void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
658 UUID imSessionID, string fromName, byte dialog, uint timeStamp, 658 UUID imSessionID, string fromName, byte dialog, uint timeStamp,
659 byte[] binaryBucket); 659 bool fromGroup, byte[] binaryBucket);
660 660
661 void SendGenericMessage(string method, List<string> message); 661 void SendGenericMessage(string method, List<string> message);
662 662
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;
4092Console.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;
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 9312fd8..3e45f7f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -117,7 +117,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
117 = ((dialog == 38) || (dialog == 39) || (dialog == 40) 117 = ((dialog == 38) || (dialog == 39) || (dialog == 40)
118 || dialog == (byte) InstantMessageDialog.InventoryOffered 118 || dialog == (byte) InstantMessageDialog.InventoryOffered
119 || dialog == (byte) InstantMessageDialog.InventoryAccepted 119 || dialog == (byte) InstantMessageDialog.InventoryAccepted
120 || dialog == (byte) InstantMessageDialog.InventoryDeclined); 120 || dialog == (byte) InstantMessageDialog.InventoryDeclined
121 || dialog == (byte) InstantMessageDialog.GroupNotice);
121 122
122 // IM dialogs need to be pre-processed and have their sessionID filled by the server 123 // IM dialogs need to be pre-processed and have their sessionID filled by the server
123 // so the sim can match the transaction on the return packet. 124 // so the sim can match the transaction on the return packet.
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index ed58338..b18fb5d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
127 127
128 user.ControllingClient.SendInstantMessage( 128 user.ControllingClient.SendInstantMessage(
129 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 129 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
130 dialog, timestamp, binaryBucket); 130 dialog, timestamp, false, binaryBucket);
131 131
132 return; 132 return;
133 } 133 }
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
159 { 159 {
160 user.ControllingClient.SendInstantMessage( 160 user.ControllingClient.SendInstantMessage(
161 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 161 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
162 dialog, timestamp, binaryBucket); 162 dialog, timestamp, false, binaryBucket);
163 163
164 if (m_pendingOffers.ContainsKey(imSessionID)) 164 if (m_pendingOffers.ContainsKey(imSessionID))
165 { 165 {
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
205 { 205 {
206 user.ControllingClient.SendInstantMessage( 206 user.ControllingClient.SendInstantMessage(
207 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 207 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
208 dialog, timestamp, binaryBucket); 208 dialog, timestamp, false, binaryBucket);
209 209
210 if (m_pendingOffers.ContainsKey(imSessionID)) 210 if (m_pendingOffers.ContainsKey(imSessionID))
211 { 211 {
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index e2b035a..5c22bb1 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
478 478
479 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 479 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
480 UUID imSessionID, string fromName, byte dialog, uint timeStamp, 480 UUID imSessionID, string fromName, byte dialog, uint timeStamp,
481 byte[] binaryBucket) 481 bool fromGroup, byte[] binaryBucket)
482 { 482 {
483 } 483 }
484 484
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index d61d649..ad2fcdf 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -390,7 +390,7 @@ namespace OpenSim.Region.Examples.SimpleModule
390 390
391 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 391 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
392 UUID imSessionID, string fromName, byte dialog, uint timeStamp, 392 UUID imSessionID, string fromName, byte dialog, uint timeStamp,
393 byte[] binaryBucket) 393 bool fromGroup, byte[] binaryBucket)
394 { 394 {
395 } 395 }
396 396