Thank you, Snowdrop, for a patch that makes the callback ID parameter

usable. Applied with formatting changes, please don't introduce
K&R style indentations into OpenSim
Fixes Mantis #3190

2 files changed, 8 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 2800e9e..f5d7b32 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (userInfo != null)
             {
                 AddInventoryItem(remoteClient.AgentId, item);
-                remoteClient.SendInventoryItemCreateUpdate(item);
+                remoteClient.SendInventoryItemCreateUpdate(item, 0);
             }
             else
             {
@@ -846,7 +846,7 @@ namespace OpenSim.Region.Framework.Scenes
                 item.CreationDate = creationDate;
 
                 userInfo.AddItem(item);
-                remoteClient.SendInventoryItemCreateUpdate(item);
+                remoteClient.SendInventoryItemCreateUpdate(item, callbackID);
             }
             else
             {
@@ -1379,6 +1379,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (part != null)
             {
+                                
                 TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID);
                 bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
                                            & (uint)PrimFlags.AllowInventoryDrop) != 0;
@@ -2003,14 +2004,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (remoteClient != null && item.Owner == remoteClient.AgentId)
                 {
-                    remoteClient.SendInventoryItemCreateUpdate(item);
+                    remoteClient.SendInventoryItemCreateUpdate(item, 0);
                 }
                 else
                 {
                     ScenePresence notifyUser = GetScenePresence(item.Owner);
                     if (notifyUser != null)
                     {
-                        notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item);
+                        notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
                     }
                 }
             }
@@ -2092,7 +2093,7 @@ namespace OpenSim.Region.Framework.Scenes
                         // this gets called when the agent loggs off!
                         if (remoteClient != null)
                         {
-                            remoteClient.SendInventoryItemCreateUpdate(item);
+                            remoteClient.SendInventoryItemCreateUpdate(item, 0);
                         }
                     }
                 }
@@ -2151,7 +2152,7 @@ namespace OpenSim.Region.Framework.Scenes
                     grp.SetFromAssetID(item.ID);
 
                     userInfo.AddItem(item);
-                    remoteClient.SendInventoryItemCreateUpdate(item);
+                    remoteClient.SendInventoryItemCreateUpdate(item, 0);
 
                     itemID = item.ID;
                     return item.AssetID;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1d2f37a..23c4478 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3581,7 +3581,7 @@ namespace OpenSim.Region.Framework.Scenes
                     item.CreationDate = Util.UnixTimeSinceEpoch();
 
                     userInfo.AddItem(item);
-                    remoteClient.SendInventoryItemCreateUpdate(item);
+                    remoteClient.SendInventoryItemCreateUpdate(item, 0);
                 }
                 else
                 {