11 files changed, 115 insertions, 0 deletions

diff --git a/OpenSim/Data/IInventoryData.cs b/OpenSim/Data/IInventoryData.cs
index 03b1cbe..84a857c 100644
--- a/OpenSim/Data/IInventoryData.cs
+++ b/OpenSim/Data/IInventoryData.cs
@@ -109,6 +109,12 @@ namespace OpenSim.Data
         void deleteInventoryItem(UUID item);
 
         /// <summary>
+        ///
+        /// </summary>
+        /// <param name="item"></param>
+        InventoryItemBase queryInventoryItem(UUID item);
+
+        /// <summary>
         /// Adds a new folder specified by folder
         /// </summary>
         /// <param name="folder">The inventory folder</param>
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 348682c..3d25ed0 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -530,6 +530,11 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
+        public InventoryItemBase queryInventoryItem(UUID itemID)
+        {
+            return null;
+        }
+
         /// <summary>
         /// Returns all activated gesture-items in the inventory of the specified avatar.
         /// </summary>
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 7d29061..1a6f068 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -539,6 +539,11 @@ namespace OpenSim.Data.MySQL
             }
         }
 
+        public InventoryItemBase queryInventoryItem(UUID itemID)
+        {
+            return getInventoryItem(itemID);
+        }
+
         /// <summary>
         /// Creates a new inventory folder
         /// </summary>
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 612ab59..74f6eae 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -177,6 +177,11 @@ namespace OpenSim.Data.NHibernate
             
         }
 
+        public InventoryItemBase queryInventoryItem(UUID itemID)
+        {
+            return null;
+        }
+
         /// <summary>
         /// Returns an inventory folder by its UUID
         /// </summary>
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 6391c6d..3be320f 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -618,6 +618,11 @@ namespace OpenSim.Data.SQLite
             }
         }
 
+        public InventoryItemBase queryInventoryItem(UUID itemID)
+        {
+            return null;
+        }
+
         /// <summary>
         /// Delete all items in the specified folder
         /// </summary>
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index c5bbd6a..57c3ece 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Framework.Communications.Cache
     internal delegate void AddItemDelegate(InventoryItemBase itemInfo);
     internal delegate void UpdateItemDelegate(InventoryItemBase itemInfo);
     internal delegate void DeleteItemDelegate(UUID itemID);
+    internal delegate void QueryItemDelegate(UUID itemID);
 
     internal delegate void CreateFolderDelegate(string folderName, UUID folderID, ushort folderType, UUID parentID);
     internal delegate void MoveFolderDelegate(UUID folderID, UUID parentID);
@@ -767,6 +768,47 @@ namespace OpenSim.Framework.Communications.Cache
 
             return RootFolder.FindFolderForType(type);
         }
+
+        // Load additional items that other regions have put into the database
+        // The item will be added tot he local cache. Returns true if the item
+        // was found and can be sent to the client
+        //
+        public bool QueryItem(UUID itemID)
+        {
+            if (m_hasReceivedInventory)
+            {
+                InventoryItemBase item = RootFolder.FindItem(itemID);
+
+                if (item != null)
+                {
+                    // Item is in local cache, just update client
+                    //
+                    return true;
+                }
+
+                InventoryItemBase itemInfo = m_commsManager.InventoryService.QueryItem(item);
+                if (itemInfo != null)
+                {
+                    InventoryFolderImpl folder = RootFolder.FindFolder(itemInfo.Folder);
+                    ItemReceive(itemInfo, folder);
+                    return true;
+                }
+
+                return false;
+            }
+            else
+            {
+                AddRequest(
+                    new InventoryRequest(
+                        Delegate.CreateDelegate(typeof(QueryItemDelegate), this, "QueryItem"),
+                        new object[] { itemID }));
+
+                return true;
+            }
+
+            return false;
+        }
+
     }
 
     /// <summary>
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index aead3be..fc9d8af 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -105,6 +105,14 @@ namespace OpenSim.Framework.Communications
         bool DeleteItem(InventoryItemBase item);
 
         /// <summary>
+        /// Query the server for an item that may have been added by
+        /// another region
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was found in local cache</returns>
+        InventoryItemBase QueryItem(InventoryItemBase item);
+
+        /// <summary>
         /// Does the given user have an inventory structure?
         /// </summary>
         /// <param name="userID"></param>
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 8068080..cad7989 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -278,6 +278,20 @@ namespace OpenSim.Framework.Communications
             return true;
         }
 
+        public virtual InventoryItemBase QueryItem(InventoryItemBase item)
+        {
+            foreach (IInventoryDataPlugin plugin in m_plugins)
+            {
+                InventoryItemBase result = plugin.queryInventoryItem(item.ID);
+                if (result != null)
+                {
+                    return result;
+                }
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Purge a folder of all items items and subfolders.
         ///
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 8ca7c3d..70bfe60 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -127,6 +127,10 @@ namespace OpenSim.Grid.InventoryServer
                 new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
                     "POST", "/DeleteItem/", m_inventoryService.DeleteItem, m_inventoryService.CheckAuthSession));
 
+            m_httpServer.AddStreamHandler(
+                new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>(
+                    "POST", "/QueryItem/", m_inventoryService.QueryItem, m_inventoryService.CheckAuthSession));
+
             // WARNING: Root folders no longer just delivers the root and immediate child folders (e.g
             // system folders such as Objects, Textures), but it now returns the entire inventory skeleton.
             // It would have been better to rename this request, but complexities in the BaseHttpServer
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 49d5938..56566a8 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -296,6 +296,22 @@ namespace OpenSim.Region.Communications.OGS1
             return false;
         }
 
+        public InventoryItemBase QueryItem(InventoryItemBase item)
+        {
+            try
+            {
+                return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, InventoryItemBase>(
+                    "POST", _inventoryServerUrl + "/QueryItem/", item);
+            }
+            catch (WebException e)
+            {
+                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Query inventory item operation failed, {0} {1}",
+                     e.Source, e.Message);
+            }
+
+            return null;
+        }
+
         public bool HasInventoryForUser(UUID userID)
         {
             return false;
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index 59d923c..69b0917 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -115,6 +115,11 @@ namespace OpenSim.Tests.Common.Mock
         public void updateInventoryItem(InventoryItemBase item) {}
         public void deleteInventoryItem(UUID item) {}
 
+        public InventoryItemBase queryInventoryItem(UUID item)
+        {
+            return null;
+        }
+
         public void addInventoryFolder(InventoryFolderBase folder)
         {
             m_folders[folder.ID] = folder;