From c29105aa3ee52e158b4c7870409165a89be4bcf6 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Mon, 3 Dec 2007 17:24:27 +0000
Subject: [PATCH] This is a simple patch which just renames an IClientAPI
 method to SendInventoryItemCreateUpdate() in order to reflect the actual
 packet it sends (UpdateCreateInventoryItem).

From Justin Casey (IBM)
---
 .../Framework/Communications/Cache/AssetTransactions.cs   | 2 +-
 OpenSim/Framework/IClientAPI.cs                           | 8 +++++++-
 OpenSim/Region/ClientStack/ClientView.cs                  | 3 ++-
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs      | 8 ++++----
 OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs       | 2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index f7e80c96c2..9bc24e799c 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications.Cache
                     item.inventoryNextPermissions = nextPerm;
 
                     userInfo.AddItem(ourClient.AgentId, item);
-                    ourClient.SendInventoryItemUpdate(item);
+                    ourClient.SendInventoryItemCreateUpdate(item);
                 }
             }
 
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index ae46d8e030..a3177f70e3 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -477,7 +477,13 @@ namespace OpenSim.Framework
 
         void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items, int subFoldersCount);
         void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item);
-        void SendInventoryItemUpdate(InventoryItemBase Item);
+        
+        /// <summary>
+        /// Tell the client that we have created the item it requested.
+        /// </summary>
+        /// <param name="Item"></param>        
+        void SendInventoryItemCreateUpdate(InventoryItemBase Item);
+        
         void SendRemoveInventoryItem(LLUUID itemID);
         void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName);
         void SendXferPacket(ulong xferID, uint packet, byte[] data);
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index e3a40ea280..f04a70a20b 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1176,7 +1176,8 @@ namespace OpenSim.Region.ClientStack
             OutPacket(inventoryReply, ThrottleOutPacketType.Asset);
         }
 
-        public void SendInventoryItemUpdate(InventoryItemBase Item)
+        /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
+        public void SendInventoryItemCreateUpdate(InventoryItemBase Item)
         {
             Encoding enc = Encoding.ASCII;
             uint FULL_MASK_PERMISSIONS = 2147483647;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 6370bcb288..1ea8d5a136 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Environment.Scenes
             if (userInfo != null)
             {
                 userInfo.AddItem(remoteClient.AgentId, item);
-                remoteClient.SendInventoryItemUpdate(item);
+                remoteClient.SendInventoryItemCreateUpdate(item);
             }
         }
 
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
                         item.assetID = asset.FullID;
                         userInfo.UpdateItem(remoteClient.AgentId, item);
 
-                        // remoteClient.SendInventoryItemUpdate(item);
+                        // remoteClient.SendInventoryItemCreateUpdate(item);
                         if ((InventoryType) item.invType == InventoryType.Notecard)
                         {
                             //do we want to know about updated note cards?
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes
                 item.inventoryNextPermissions = nextOwnerMask;
 
                 userInfo.AddItem(remoteClient.AgentId, item);
-                remoteClient.SendInventoryItemUpdate(item);
+                remoteClient.SendInventoryItemCreateUpdate(item);
             }
         }
 
@@ -423,7 +423,7 @@ namespace OpenSim.Region.Environment.Scenes
                                 item.inventoryNextPermissions = 2147483647;
 
                                 userInfo.AddItem(remoteClient.AgentId, item);
-                                remoteClient.SendInventoryItemUpdate(item);
+                                remoteClient.SendInventoryItemCreateUpdate(item);
                             }
 
                             DeleteSceneObjectGroup((SceneObjectGroup) selectedEnt);
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index 14c43808a1..6887debaed 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -310,7 +310,7 @@ namespace SimpleApp
         {
         }
 
-        public virtual void SendInventoryItemUpdate(InventoryItemBase Item)
+        public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item)
         {
         }