aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-03-22 14:32:15 +0000
committerMelanie Thielker2009-03-22 14:32:15 +0000
commitea1e38dd14c2e80315a969fd25e35ba56a80c4e3 (patch)
tree1ad1d8b5294afdd0b6897ae61f72df8909c94b70
parentThank you, dslake, for a patch that fixes XEngine linemap handling. (diff)
downloadopensim-SC-ea1e38dd14c2e80315a969fd25e35ba56a80c4e3.zip
opensim-SC-ea1e38dd14c2e80315a969fd25e35ba56a80c4e3.tar.gz
opensim-SC-ea1e38dd14c2e80315a969fd25e35ba56a80c4e3.tar.bz2
opensim-SC-ea1e38dd14c2e80315a969fd25e35ba56a80c4e3.tar.xz
Cause the inventory give module to be more selective and not attempt to
deliver other modules' IM types
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 64ec356..147d453 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -392,6 +392,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
392 /// <param name="msg"></param> 392 /// <param name="msg"></param>
393 private void OnGridInstantMessage(GridInstantMessage msg) 393 private void OnGridInstantMessage(GridInstantMessage msg)
394 { 394 {
395 // Check if this is ours to handle
396 //
397 if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered)
398 return;
399
400 if (msg.binaryBucket.Length < 17) // Invalid
401 return;
402
395 Scene scene = FindClientScene(new UUID(msg.toAgentID)); 403 Scene scene = FindClientScene(new UUID(msg.toAgentID));
396 404
397 // Find agent to deliver to 405 // Find agent to deliver to