OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

avinationmerge
Tom 2010-08-06 08:09:10 -07:00
parent 52e2360e91 696c2c429b
commit 0d4086e602
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -388,7 +388,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
PostEvent(new EventParams("attach", PostEvent(new EventParams("attach",
new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0])); 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"); // m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
PostEvent(new EventParams("changed", PostEvent(new EventParams("changed",

1
OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
View File

@ -408,6 +408,7 @@ namespace OpenSim.Server.Handlers.Asset
byte[] HandlePurgeFolder(Dictionary<string,object> request) byte[] HandlePurgeFolder(Dictionary<string,object> request)
{ {
Dictionary<string,object> result = new Dictionary<string,object>(); Dictionary<string,object> result = new Dictionary<string,object>();
UUID folderID = UUID.Zero; UUID folderID = UUID.Zero;
UUID.TryParse(request["ID"].ToString(), out folderID); UUID.TryParse(request["ID"].ToString(), out folderID);

4
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -342,7 +342,6 @@ namespace OpenSim.Services.InventoryService
m_Database.DeleteFolders("folderID", x.folderID.ToString()); m_Database.DeleteFolders("folderID", x.folderID.ToString());
} }
m_Database.DeleteItems("parentFolderID", folder.ID.ToString());
return true; return true;
} }
@ -542,6 +541,9 @@ namespace OpenSim.Services.InventoryService
if (folder.Length < 1) if (folder.Length < 1)
return false; return false;
if (folder[0].type == (int)AssetType.TrashFolder)
return true;
UUID parentFolder = folder[0].parentFolderID; UUID parentFolder = folder[0].parentFolderID;
while (parentFolder != UUID.Zero) while (parentFolder != UUID.Zero)