3 files changed, 78 insertions, 30 deletions

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));
 
         }