aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-12-23 21:22:19 +0000
committerMelanie2009-12-23 21:22:19 +0000
commit6eecbc95e41aa75259e3b27426878c2c191832d8 (patch)
treebca7dda2195a83462d9fa04a3442b4e993334b44 /OpenSim/Framework
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-6eecbc95e41aa75259e3b27426878c2c191832d8.zip
opensim-SC-6eecbc95e41aa75259e3b27426878c2c191832d8.tar.gz
opensim-SC-6eecbc95e41aa75259e3b27426878c2c191832d8.tar.bz2
opensim-SC-6eecbc95e41aa75259e3b27426878c2c191832d8.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs21
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs14
2 files changed, 27 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 42e6510..74ba0a5 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -232,7 +232,26 @@ namespace OpenSim.Framework.Communications.Cache
232 /// <returns></returns> 232 /// <returns></returns>
233 public Dictionary<UUID, InventoryFolderImpl> RequestSelfAndDescendentFolders() 233 public Dictionary<UUID, InventoryFolderImpl> RequestSelfAndDescendentFolders()
234 { 234 {
235 return libraryFolders; 235 Dictionary<UUID, InventoryFolderImpl> fs = new Dictionary<UUID, InventoryFolderImpl>();
236 fs.Add(ID, this);
237 List<InventoryFolderImpl> fis = TraverseFolder(this);
238 foreach (InventoryFolderImpl f in fis)
239 {
240 fs.Add(f.ID, f);
241 }
242 //return libraryFolders;
243 return fs;
244 }
245
246 private List<InventoryFolderImpl> TraverseFolder(InventoryFolderImpl node)
247 {
248 List<InventoryFolderImpl> folders = node.RequestListOfFolderImpls();
249 List<InventoryFolderImpl> subs = new List<InventoryFolderImpl>();
250 foreach (InventoryFolderImpl f in folders)
251 subs.AddRange(TraverseFolder(f));
252
253 folders.AddRange(subs);
254 return folders;
236 } 255 }
237 } 256 }
238} 257}
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 08f1bec..857c584 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -322,15 +322,15 @@ namespace OpenSim.Framework.Servers.HttpServer
322 HandleRequest(req, resp); 322 HandleRequest(req, resp);
323 } 323 }
324 324
325 public void ConvertIHttpClientContextToOSHttp(object stateinfo) 325 // public void ConvertIHttpClientContextToOSHttp(object stateinfo)
326 { 326 // {
327 HttpServerContextObj objstate = (HttpServerContextObj)stateinfo; 327 // HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
328 328
329 OSHttpRequest request = objstate.oreq; 329 // OSHttpRequest request = objstate.oreq;
330 OSHttpResponse resp = objstate.oresp; 330 // OSHttpResponse resp = objstate.oresp;
331 331
332 HandleRequest(request,resp); 332 // HandleRequest(request,resp);
333 } 333 // }
334 334
335 public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response) 335 public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
336 { 336 {