Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

3 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index dcbe0c4..b4da246 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -388,7 +388,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     PostEvent(new EventParams("attach",
                         new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
                 }
-                else if (m_stateSource == StateSource.NewRez)
+                else if (m_stateSource == StateSource.RegionStart)
                 {
 //                    m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
                     PostEvent(new EventParams("changed",
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index ac6a3ab..e3d30e5 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -408,6 +408,7 @@ namespace OpenSim.Server.Handlers.Asset
 
         byte[] HandlePurgeFolder(Dictionary<string,object> request)
         {
+
             Dictionary<string,object> result = new Dictionary<string,object>();
             UUID folderID = UUID.Zero;
             UUID.TryParse(request["ID"].ToString(), out folderID);
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index f581f76..26c5b33 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -342,7 +342,6 @@ namespace OpenSim.Services.InventoryService
                 m_Database.DeleteFolders("folderID", x.folderID.ToString());
             }
 
-            m_Database.DeleteItems("parentFolderID", folder.ID.ToString());
 
             return true;
         }
@@ -542,6 +541,9 @@ namespace OpenSim.Services.InventoryService
             if (folder.Length < 1)
                 return false;
 
+            if (folder[0].type == (int)AssetType.TrashFolder)
+                return true;
+
             UUID parentFolder = folder[0].parentFolderID;
 
             while (parentFolder != UUID.Zero)