ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2009-12-23 21:22:19 +00:00
parent 30f59370d3 f2d2073f2b
commit 6eecbc95e4
7 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@@ -232,7 +232,26 @@ namespace OpenSim.Framework.Communications.Cache
/// <returns></returns>
public Dictionary<UUID, InventoryFolderImpl> RequestSelfAndDescendentFolders()
{
return libraryFolders;
Dictionary<UUID, InventoryFolderImpl> fs = new Dictionary<UUID, InventoryFolderImpl>();
fs.Add(ID, this);
List<InventoryFolderImpl> fis = TraverseFolder(this);
foreach (InventoryFolderImpl f in fis)
{
fs.Add(f.ID, f);
}
//return libraryFolders;
return fs;
}
private List<InventoryFolderImpl> TraverseFolder(InventoryFolderImpl node)
{
List<InventoryFolderImpl> folders = node.RequestListOfFolderImpls();
List<InventoryFolderImpl> subs = new List<InventoryFolderImpl>();
foreach (InventoryFolderImpl f in folders)
subs.AddRange(TraverseFolder(f));
folders.AddRange(subs);
return folders;
}
}
}

14
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -322,15 +322,15 @@ namespace OpenSim.Framework.Servers.HttpServer
HandleRequest(req, resp);
}
public void ConvertIHttpClientContextToOSHttp(object stateinfo)
{
HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
// public void ConvertIHttpClientContextToOSHttp(object stateinfo)
// {
// HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
OSHttpRequest request = objstate.oreq;
OSHttpResponse resp = objstate.oresp;
// OSHttpRequest request = objstate.oreq;
// OSHttpResponse resp = objstate.oresp;
HandleRequest(request,resp);
}
// HandleRequest(request,resp);
// }
public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
{