8 files changed, 171 insertions, 42 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
index 2e402a4..a2b2c84 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
@@ -113,6 +113,17 @@ namespace OpenSim.Region.Communications.Hypergrid
 
                     m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
                         e.Source, e.Message);
+
+                    // Well, let's synthesize one
+                    InventoryCollection icol = new InventoryCollection();
+                    icol.UserID = userID;
+                    icol.Items = new List<InventoryItemBase>();
+                    icol.Folders = new List<InventoryFolderBase>();
+                    InventoryFolderBase rootFolder = new InventoryFolderBase();
+                    rootFolder.ID = UUID.Random();
+                    rootFolder.Owner = userID;
+                    icol.Folders.Add(rootFolder);
+                    InventoryResponse(icol);
                 }
             }
             else
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index fb293e8..1e430e5 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -244,6 +244,19 @@ namespace OpenSim.Region.CoreModules.Communications.Local
             return false;
         }
 
+        public bool SendCreateObject(ulong regionHandle, UUID userID, UUID itemID)
+        {
+            foreach (Scene s in m_sceneList)
+            {
+                if (s.RegionInfo.RegionHandle == regionHandle)
+                {
+                    return s.IncomingCreateObject(userID, itemID);
+                }
+            }
+            return false;
+        }
+
+
         /**
          * Region-related communications 
          */
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index b507bdd..90104f2 100644
--- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -276,6 +276,12 @@ namespace OpenSim.Region.CoreModules.Communications.REST
             return false;
         }
 
+        public bool SendCreateObject(ulong regionHandle, UUID userID, UUID itemID)
+        {
+            // Not Implemented
+            return false;
+        }
+
         /**
          * Region-related communications 
         */
@@ -527,13 +533,13 @@ namespace OpenSim.Region.CoreModules.Communications.REST
 
         public Hashtable ObjectHandler(Hashtable request)
         {
-            //m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called");
+            m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called");
 
-            //m_log.Debug("---------------------------");
-            //m_log.Debug(" >> uri=" + request["uri"]);
-            //m_log.Debug(" >> content-type=" + request["content-type"]);
-            //m_log.Debug(" >> http-method=" + request["http-method"]);
-            //m_log.Debug("---------------------------\n");
+            m_log.Debug("---------------------------");
+            m_log.Debug(" >> uri=" + request["uri"]);
+            m_log.Debug(" >> content-type=" + request["content-type"]);
+            m_log.Debug(" >> http-method=" + request["http-method"]);
+            m_log.Debug("---------------------------\n");
 
             Hashtable responsedata = new Hashtable();
             responsedata["content_type"] = "text/html";
@@ -557,11 +563,11 @@ namespace OpenSim.Region.CoreModules.Communications.REST
                 DoObjectPost(request, responsedata, regionHandle);
                 return responsedata;
             }
-            //else if (method.Equals("PUT"))
-            //{
-            //    DoObjectPut(request, responsedata, agentID);
-            //    return responsedata;
-            //}
+            else if (method.Equals("PUT"))
+            {
+                DoObjectPut(request, responsedata, regionHandle);
+                return responsedata;
+            }
             //else if (method.Equals("DELETE"))
             //{
             //    DoObjectDelete(request, responsedata, agentID, action, regionHandle);
@@ -632,6 +638,31 @@ namespace OpenSim.Region.CoreModules.Communications.REST
             responsedata["str_response_string"] = result.ToString();
         }
 
+        protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, ulong regionhandle)
+        {
+            OSDMap args = RegionClient.GetOSDMap((string)request["body"]);
+            if (args == null)
+            {
+                responsedata["int_response_code"] = 400;
+                responsedata["str_response_string"] = "false";
+                return;
+            }
+
+            UUID userID = UUID.Zero, itemID = UUID.Zero;
+            if (args["userid"] != null)
+                userID = args["userid"].AsUUID();
+            if (args["itemid"] != null)
+                itemID = args["itemid"].AsUUID();
+
+            UUID regionID = m_localBackend.GetRegionID(regionhandle);
+
+            // This is the meaning of PUT object
+            bool result = m_localBackend.SendCreateObject(regionhandle, userID, itemID);
+
+            responsedata["int_response_code"] = 200;
+            responsedata["str_response_string"] = result.ToString();
+        }
+
         /*
          * Region-related incoming calls
          * 
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs
index 741075c..3675583 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool initialized = false;
         private static bool enabled = false;
+        private static bool safemode = false;
 
         private bool m_doLookup = false;
         Scene m_scene;
@@ -77,6 +78,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
                 // This module is only on for standalones
                 enabled = !config.Configs["Startup"].GetBoolean("gridmode", true) && config.Configs["Startup"].GetBoolean("hypergrid", false);
+                if (config.Configs["Hypergrid"] != null)
+                    safemode = config.Configs["Hypergrid"].GetBoolean("safemode", false);
             }
         }
 
@@ -116,34 +119,35 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         public virtual void AddHttpHandlers(IHttpServer httpServer)
         {
-
-            httpServer.AddStreamHandler(
-                new RestDeserialiseSecureHandler<Guid, InventoryCollection>(
-                    "POST", "/GetInventory/", m_inventoryService.GetUserInventory, CheckAuthSession));
+            if (!safemode)
+            {
+                httpServer.AddStreamHandler(
+                    new RestDeserialiseSecureHandler<Guid, InventoryCollection>(
+                        "POST", "/GetInventory/", m_inventoryService.GetUserInventory, CheckAuthSession));
+                httpServer.AddStreamHandler(
+                    new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
+                        "POST", "/DeleteItem/", m_inventoryBase.DeleteItem, CheckAuthSession));
+                httpServer.AddStreamHandler(
+                    new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
+                        "POST", "/UpdateFolder/", m_inventoryBase.UpdateFolder, CheckAuthSession));
+
+                httpServer.AddStreamHandler(
+                    new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
+                        "POST", "/MoveFolder/", m_inventoryBase.MoveFolder, CheckAuthSession));
+
+                httpServer.AddStreamHandler(
+                    new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
+                        "POST", "/PurgeFolder/", m_inventoryBase.PurgeFolder, CheckAuthSession));
+            }
 
             httpServer.AddStreamHandler(
                 new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
                     "POST", "/NewFolder/", m_inventoryBase.AddFolder, CheckAuthSession));
 
             httpServer.AddStreamHandler(
-                new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
-                    "POST", "/UpdateFolder/", m_inventoryBase.UpdateFolder, CheckAuthSession));
-
-            httpServer.AddStreamHandler(
-                new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
-                    "POST", "/MoveFolder/", m_inventoryBase.MoveFolder, CheckAuthSession));
-
-            httpServer.AddStreamHandler(
-                new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
-                    "POST", "/PurgeFolder/", m_inventoryBase.PurgeFolder, CheckAuthSession));
-
-            httpServer.AddStreamHandler(
                 new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
                     "POST", "/NewItem/", m_inventoryBase.AddItem, CheckAuthSession));
 
-            httpServer.AddStreamHandler(
-                new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
-                    "POST", "/DeleteItem/", m_inventoryBase.DeleteItem, CheckAuthSession));
 
         }
 
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index ef3cb51..b57b5ed 100644
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -89,6 +89,16 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <returns></returns>
         bool SendCreateObject(ulong regionHandle, ISceneObject sog, bool isLocalCall);
 
+        /// <summary>
+        /// Create an object from the user's inventory in the destination region. 
+        /// This message is used primarily for prim crossing.
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="sog"></param>
+        /// <param name="isLocalCall"></param>
+        /// <returns></returns>
+        bool SendCreateObject(ulong regionHandle, UUID userID, UUID itemID);
+
         #endregion Objects
 
         #region Regions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index e9106e5..b192101 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -33,6 +33,7 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Clients;
 
 //using HyperGrid.Framework;
 //using OpenSim.Region.Communications.Hypergrid;
@@ -50,6 +51,10 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
         // This maps between asset UUIDs and asset servers
         private Dictionary<UUID, GridAssetClient> m_assetMap = new Dictionary<UUID, GridAssetClient>();
 
+        // This maps between inventory server urls and inventory server clients
+        private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>();
+
+
         private Scene m_scene;
         #endregion
 
@@ -72,6 +77,14 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
             return null;
         }
 
+        private string UserInventoryURL(UUID userID)
+        {
+            CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
+            if (uinfo != null)
+                return (uinfo.UserProfile.UserInventoryURI == "") ? null : uinfo.UserProfile.UserInventoryURI;
+            return null;
+        }
+
         private bool IsLocalUser(UUID userID)
         {
             CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
@@ -275,9 +288,9 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
 
         #region Public interface
 
-        public void Get(UUID itemID, UUID ownerID)
+        public void Get(UUID assetID, UUID ownerID)
         {
-            if (!IsInAssetMap(itemID) && !IsLocalUser(ownerID))
+            if (!IsInAssetMap(assetID) && !IsLocalUser(ownerID))
             {
                 // Get the item from the remote asset server onto the local AssetCache
                 // and place an entry in m_assetMap
@@ -295,11 +308,11 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                         m_assetServers.Add(userAssetURL, asscli);
                     }
 
-                    m_log.Debug("[HGScene]: Fetching object " + itemID + " to asset server " + userAssetURL);
-                    bool success = FetchAsset(asscli, itemID, false); // asscli.RequestAsset(item.ItemID, false);
+                    m_log.Debug("[HGScene]: Fetching object " + assetID + " to asset server " + userAssetURL);
+                    bool success = FetchAsset(asscli, assetID, false); // asscli.RequestAsset(item.ItemID, false);
 
                     // OK, now fetch the inside.
-                    Dictionary<UUID, bool> ids = SniffUUIDs(itemID);
+                    Dictionary<UUID, bool> ids = SniffUUIDs(assetID);
                     Dump(ids);
                     foreach (KeyValuePair<UUID, bool> kvp in ids)
                         FetchAsset(asscli, kvp.Key, kvp.Value);
@@ -308,7 +321,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                     if (success)
                     {
                         m_log.Debug("[HGScene]: Successfully fetched item from remote asset server " + userAssetURL);
-                        m_assetMap.Add(itemID, asscli);
+                        m_assetMap.Add(assetID, asscli);
                     }
                     else
                         m_log.Warn("[HGScene]: Could not fetch asset from remote asset server " + userAssetURL);
@@ -318,7 +331,36 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
             }
         }
 
-        public void Post(UUID itemID, UUID ownerID)
+        public InventoryItemBase Get(InventoryItemBase item, UUID rootFolder, CachedUserInfo userInfo)
+        {
+            if (!IsLocalUser(item.Owner))
+            {
+                InventoryClient invCli = null;
+                string inventoryURL = UserInventoryURL(item.Owner);
+                if (!m_inventoryServers.TryGetValue(inventoryURL, out invCli))
+                {
+                    m_log.Debug("[HGScene]: Starting new InventorytClient for " + inventoryURL);
+                    invCli = new InventoryClient(inventoryURL);
+                    m_inventoryServers.Add(inventoryURL, invCli);
+                }
+
+                item = invCli.GetInventoryItem(item);
+                if (item != null)
+                {
+                    // Change the folder, stick it in root folder, all items flattened out here in this region cache
+                    item.Folder = rootFolder;
+                    //userInfo.AddItem(item); don't use this, it calls back to the inventory server
+                    lock (userInfo.RootFolder.Items)
+                    {
+                        userInfo.RootFolder.Items[item.ID] = item;
+                    }
+
+                }
+            }
+            return item;
+        }
+
+        public void Post(UUID assetID, UUID ownerID)
         {
             if (!IsLocalUser(ownerID))
             {
@@ -337,11 +379,11 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                         asscli.SetReceiver(m_scene.CommsManager.AssetCache); // Straight to the asset cache!
                         m_assetServers.Add(userAssetURL, asscli);
                     }
-                    m_log.Debug("[HGScene]: Posting object " + itemID + " to asset server " + userAssetURL);
-                    bool success = PostAsset(asscli, itemID);
+                    m_log.Debug("[HGScene]: Posting object " + assetID + " to asset server " + userAssetURL);
+                    bool success = PostAsset(asscli, assetID);
 
                     // Now the inside
-                    Dictionary<UUID, bool> ids = SniffUUIDs(itemID);
+                    Dictionary<UUID, bool> ids = SniffUUIDs(assetID);
                     Dump(ids);
                     foreach (KeyValuePair<UUID, bool> kvp in ids)
                         PostAsset(asscli, kvp.Key);
@@ -349,8 +391,8 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                     if (success)
                     {
                         m_log.Debug("[HGScene]: Successfully posted item to remote asset server " + userAssetURL);
-                        if (!m_assetMap.ContainsKey(itemID))
-                            m_assetMap.Add(itemID, asscli);
+                        if (!m_assetMap.ContainsKey(assetID))
+                            m_assetMap.Add(assetID, asscli);
                     }
                     else
                         m_log.Warn("[HGScene]: Could not post asset to remote asset server " + userAssetURL);
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index 93b81e0..4fde9bb 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -120,6 +120,13 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                 {
                     InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
 
+                    if (item == null)
+                    { // Fetch the item
+                        item = new InventoryItemBase();
+                        item.Owner = remoteClient.AgentId;
+                        item.ID = itemID;
+                        item = m_assMapper.Get(item, userInfo.RootFolder.ID, userInfo);
+                    }
                     if (item != null)
                     {
                         m_assMapper.Get(item.AssetID, remoteClient.AgentId);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5f68ccb..30257f1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1731,6 +1731,17 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+        public virtual bool IncomingCreateObject(UUID userID, UUID itemID)
+        {
+            ScenePresence sp = GetScenePresence(userID);
+            if (sp != null)
+            {
+                uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);
+                SceneObjectGroup sog = m_sceneGraph.RezSingleAttachment(sp.ControllingClient, itemID, attPt);
+            }
+            return false;
+        }
+
         public bool AddSceneObject(UUID primID, SceneObjectGroup sceneObject)
         {
             // If the user is banned, we won't let any of their objects