OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove bad merge from master

avinationmerge
UbitUmarov 2015-09-16 16:34:16 +01:00
parent 9ac01010f4
commit 2f1eab2792
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@ -470,18 +470,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
/// <param name="im"></param> /// <param name="im"></param>
private void OnGridInstantMessage(GridInstantMessage im) private void OnGridInstantMessage(GridInstantMessage im)
{ {
// Check if it's a type of message that we should handle
if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered)
|| (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered)
|| (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
|| (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
|| (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)))
return;
m_log.DebugFormat(
"[INVENTORY TRANSFER]: {0} IM type received from grid. From={1} ({2}), To={3}",
(InstantMessageDialog)im.dialog, im.fromAgentID, im.fromAgentName, im.toAgentID);
// Check if this is ours to handle // Check if this is ours to handle
// //
Scene scene = FindClientScene(new UUID(im.toAgentID)); Scene scene = FindClientScene(new UUID(im.toAgentID));