aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorMelanie Thielker2014-11-21 04:00:52 +0100
committerMelanie Thielker2014-11-21 04:00:52 +0100
commit80118ac0575ad6816f65ed7436ec4e0b384f231d (patch)
tree8f1597749206c5bec0c0fb71753f947ab1525aa2 /OpenSim/Region/CoreModules/Avatar
parent dont do recoil on llRezObject called from attachments, as seem to happen (diff)
downloadopensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.zip
opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.gz
opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.bz2
opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.xz
Remove braindead "fix" that messed up intersim scripted giving.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs11
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 03aaaac..3815c71 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -471,17 +471,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
471 /// <param name="im"></param> 471 /// <param name="im"></param>
472 private void OnGridInstantMessage(GridInstantMessage im) 472 private void OnGridInstantMessage(GridInstantMessage im)
473 { 473 {
474 // Check if it's a type of message that we should handle
475 if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered)
476 || (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
477 || (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
478 || (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)))
479 return;
480
481 m_log.DebugFormat(
482 "[INVENTORY TRANSFER]: {0} IM type received from grid. From={1} ({2}), To={3}",
483 (InstantMessageDialog)im.dialog, im.fromAgentID, im.fromAgentName, im.toAgentID);
484
485 // Check if this is ours to handle 474 // Check if this is ours to handle
486 // 475 //
487 Scene scene = FindClientScene(new UUID(im.toAgentID)); 476 Scene scene = FindClientScene(new UUID(im.toAgentID));