Merge branch 'master' of ssh://MyConnection/var/git/opensim

2 files changed, 56 insertions, 6 deletions

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 619c2d1..1d9eb0d 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -65,6 +65,10 @@ namespace OpenSim.Server.Base
         //
         private bool m_Running = true;
 
+        // PID file
+        //
+        private string m_pidFile = String.Empty;
+
         // Handle all the automagical stuff
         //
         public ServicesServerBase(string prompt, string[] args)
@@ -211,6 +215,11 @@ namespace OpenSim.Server.Base
                 }
             }
 
+            if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty)
+            {
+                CreatePIDFile(startupConfig.GetString("PIDFile"));
+            }
+
             // Register the quit command
             //
             MainConsole.Instance.Commands.AddCommand("base", false, "quit",
@@ -230,6 +239,8 @@ namespace OpenSim.Server.Base
                 MainConsole.Instance.Prompt();
             }
 
+            if (m_pidFile != String.Empty)
+                File.Delete(m_pidFile);
             return 0;
         }
 
@@ -246,5 +257,22 @@ namespace OpenSim.Server.Base
         protected virtual void Initialise()
         {
         }
+
+        protected void CreatePIDFile(string path)
+        {
+            try
+            {
+                string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
+                FileStream fs = File.Create(path);
+                System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+                Byte[] buf = enc.GetBytes(pidstring);
+                fs.Write(buf, 0, buf.Length);
+                fs.Close();
+                m_pidFile = path;
+            }
+            catch (Exception)
+            {
+            }
+        }
     }
 }
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 30b3cae..6ef1d9d 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -105,8 +105,8 @@ namespace OpenSim.Server.Handlers.Inventory
                     "POST", "/PurgeFolder/", m_InventoryService.PurgeFolder, CheckAuthSession));
 
             m_httpServer.AddStreamHandler(
-                new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
-                    "POST", "/DeleteItem/", m_InventoryService.DeleteItem, CheckAuthSession));
+                new RestDeserialiseSecureHandler<List<Guid>, bool>(
+                    "POST", "/DeleteItem/", DeleteItems, CheckAuthSession));
 
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>(
@@ -125,8 +125,8 @@ namespace OpenSim.Server.Handlers.Inventory
                     "POST", "/NewFolder/", m_InventoryService.AddFolder, CheckAuthSession));
 
             m_httpServer.AddStreamHandler(
-                new RestDeserialiseTrustedHandler<InventoryFolderBase, bool>(
-                    "POST", "/CreateFolder/", m_InventoryService.AddFolder, CheckTrustSource));
+                new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
+                    "POST", "/CreateFolder/", m_InventoryService.AddFolder, CheckAuthSession));
 
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
@@ -137,9 +137,13 @@ namespace OpenSim.Server.Handlers.Inventory
                  "POST", "/AddNewItem/", m_InventoryService.AddItem, CheckTrustSource));
 
             m_httpServer.AddStreamHandler(
-                new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>>(
-                    "POST", "/GetItems/", GetFolderItems, CheckTrustSource));
+                new RestDeserialiseSecureHandler<Guid, List<InventoryItemBase>>(
+                    "POST", "/GetItems/", GetFolderItems, CheckAuthSession));
 
+            m_httpServer.AddStreamHandler(
+                new RestDeserialiseSecureHandler<List<InventoryItemBase>, bool>(
+                    "POST", "/MoveItems/", MoveItems, CheckAuthSession));
+            
             // for persistent active gestures
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>>
@@ -247,6 +251,24 @@ namespace OpenSim.Server.Handlers.Inventory
             return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID);
         }
 
+        public bool DeleteItems(List<Guid> items)
+        {
+            List<UUID> uuids = new List<UUID>();
+            foreach (Guid g in items)
+                uuids.Add(new UUID(g));
+            // oops we lost the user info here. Bad bad handlers
+            return m_InventoryService.DeleteItems(UUID.Zero, uuids);
+        }
+
+        public bool MoveItems(List<InventoryItemBase> items)
+        {
+            // oops we lost the user info here. Bad bad handlers
+            // let's peek at one item
+            UUID ownerID = UUID.Zero;
+            if (items.Count > 0)
+                ownerID = items[0].Owner;
+            return m_InventoryService.MoveItems(ownerID, items);
+        }
         #endregion
 
         /// <summary>