3 files changed, 43 insertions, 38 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 0dad3c4..596174b 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -137,13 +137,15 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             foreach (Scene scene in m_Scenes)
             {
 //                m_log.DebugFormat(
-//                    "[INSTANT MESSAGE]: Looking for root agent {0} in {1}", 
+//                    "[INSTANT MESSAGE]: Looking for root agent {0} in {1}",
 //                    toAgentID.ToString(), scene.RegionInfo.RegionName);
+
                 ScenePresence sp = scene.GetScenePresence(toAgentID);
                 if (sp != null && !sp.IsChildAgent)
                 {
                     // Local message
-//                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
+                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", sp.Name, toAgentID);
+
                     sp.ControllingClient.SendInstantMessage(im);
 
                     // Message sent
@@ -155,13 +157,15 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             // try child avatar second
             foreach (Scene scene in m_Scenes)
             {
-//                m_log.DebugFormat(
-//                    "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName);
+                m_log.DebugFormat(
+                    "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName);
+
                 ScenePresence sp = scene.GetScenePresence(toAgentID);
                 if (sp != null)
                 {
                     // Local message
-//                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID);
+                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", sp.Name, toAgentID);
+
                     sp.ControllingClient.SendInstantMessage(im);
 
                     // Message sent
@@ -170,10 +174,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 }
             }
 
-//            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
-            SendGridInstantMessageViaXMLRPC(im, result);
+            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
 
-            return;
+            SendGridInstantMessageViaXMLRPC(im, result);
         }
 
         private void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result)
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 19c774f..f3af59a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -297,7 +297,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         });
                 }
             }
-            else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
+            else if (
+                im.dialog == (byte)InstantMessageDialog.InventoryDeclined
+                || im.dialog == (byte)InstantMessageDialog.TaskInventoryDeclined)
             {
                 // Here, the recipient is local and we can assume that the
                 // inventory is loaded. Courtesy of the above bulk update,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c1ac0e5..b43e8e7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3988,22 +3988,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (agentItem == null)
                     return;
 
-                byte[] bucket = new byte[17];
-                bucket[0] = (byte)assetType;
-                byte[] objBytes = agentItem.ID.GetBytes();
-                Array.Copy(objBytes, 0, bucket, 1, 16);
-
-                GridInstantMessage msg = new GridInstantMessage(World,
-                        m_host.UUID, m_host.Name+", an object owned by "+
-                        resolveName(m_host.OwnerID)+",", destId,
-                        (byte)InstantMessageDialog.TaskInventoryOffered,
-                        false, objName+"\n"+m_host.Name+" is located at "+
-                        World.RegionInfo.RegionName+" "+
-                        m_host.AbsolutePosition.ToString(),
-                        agentItem.ID, true, m_host.AbsolutePosition,
-                        bucket);
                 if (m_TransferModule != null)
+                {
+                    byte[] bucket = new byte[] { (byte)assetType };
+                    
+                    GridInstantMessage msg = new GridInstantMessage(World,
+                            m_host.UUID, m_host.Name + ", an object owned by " +
+                            resolveName(m_host.OwnerID) + ",", destId,
+                            (byte)InstantMessageDialog.TaskInventoryOffered,
+                            false, objName + "\n" + m_host.Name + " is located at " +
+                            World.RegionInfo.RegionName + " " +
+                            m_host.AbsolutePosition.ToString(),
+                            agentItem.ID, true, m_host.AbsolutePosition,
+                            bucket);
+
                     m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
+                }
+
                 ScriptSleep(3000);
             }
         }
@@ -6410,23 +6411,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (folderID == UUID.Zero)
                 return;
 
-            byte[] bucket = new byte[17];
-            bucket[0] = (byte)AssetType.Folder;
-            byte[] objBytes = folderID.GetBytes();
-            Array.Copy(objBytes, 0, bucket, 1, 16);
-
-            GridInstantMessage msg = new GridInstantMessage(World,
-                    m_host.UUID, m_host.Name + ", an object owned by " +
-                    resolveName(m_host.OwnerID) + ",", destID,
-                    (byte)InstantMessageDialog.InventoryOffered,
-                    false, category + "\n" + m_host.Name + " is located at " +
-                    World.RegionInfo.RegionName + " " +
-                    m_host.AbsolutePosition.ToString(),
-                    folderID, true, m_host.AbsolutePosition,
-                    bucket);
-
             if (m_TransferModule != null)
+            {
+                byte[] bucket = new byte[] { (byte)AssetType.Folder };
+    
+                GridInstantMessage msg = new GridInstantMessage(World,
+                        m_host.UUID, m_host.Name + ", an object owned by " +
+                        resolveName(m_host.OwnerID) + ",", destID,
+                        (byte)InstantMessageDialog.TaskInventoryOffered,
+                        false, category + "\n" + m_host.Name + " is located at " +
+                        World.RegionInfo.RegionName + " " +
+                        m_host.AbsolutePosition.ToString(),
+                        folderID, true, m_host.AbsolutePosition,
+                        bucket);
+
                 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
+            }
         }
 
         public void llSetVehicleType(int type)