mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 18:55:58 +08:00
fix agent_id on FetchLibDesc.. this is just a formal fix, viewers seem to just ignore it.
This commit is contained in:
@@ -58,7 +58,7 @@ namespace OpenSim.Capabilities.Handlers
|
||||
m_Scene = s;
|
||||
}
|
||||
|
||||
public void FetchRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, ExpiringKey<UUID> BadRequests)
|
||||
public void FetchRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, ExpiringKey<UUID> BadRequests, UUID agentID)
|
||||
{
|
||||
//m_log.DebugFormat("[XXX]: FetchLibDescendentsRequest in {0}, {1}", (m_Scene == null) ? "none" : m_Scene.Name, request);
|
||||
if (m_LibraryService == null || m_LibraryService.LibraryRootFolder == null)
|
||||
@@ -191,7 +191,7 @@ namespace OpenSim.Capabilities.Handlers
|
||||
|
||||
LLSDxmlEncode2.AddMap(lastresponse);
|
||||
LLSDxmlEncode2.AddElem_folder_id(thiscoll.FolderID, lastresponse);
|
||||
LLSDxmlEncode2.AddElem_agent_id(thiscoll.OwnerID, lastresponse);
|
||||
LLSDxmlEncode2.AddElem_agent_id(agentID, lastresponse);
|
||||
LLSDxmlEncode2.AddElem_owner_id(thiscoll.OwnerID, lastresponse);
|
||||
LLSDxmlEncode2.AddElem("descendents", thiscoll.Descendents, lastresponse);
|
||||
LLSDxmlEncode2.AddElem_version(thiscoll.Version, lastresponse);
|
||||
|
||||
@@ -142,7 +142,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
m_badRequests = new ExpiringKey<UUID>(30000);
|
||||
|
||||
if (ProcessQueuedRequestsAsync && m_workerpool == null)
|
||||
m_workerpool = new ObjectJobEngine(DoInventoryRequests, "InventoryWorker", 2000, 2);
|
||||
m_workerpool = new ObjectJobEngine(DoInventoryRequests, "LibInventoryWorker", 2000, 2);
|
||||
}
|
||||
|
||||
public void PostInitialise()
|
||||
@@ -167,7 +167,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
//m_queue.Dispose();
|
||||
}
|
||||
|
||||
public string Name { get { return "WebFetchInvDescModule"; } }
|
||||
public string Name { get { return "FetchLibDescModule"; } }
|
||||
|
||||
public Type ReplaceableInterface
|
||||
{
|
||||
@@ -263,7 +263,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
}
|
||||
|
||||
OSHttpResponse osresponse = new OSHttpResponse(requestinfo.request);
|
||||
m_FetchHandler.FetchRequest(requestinfo.request, osresponse, m_module.m_badRequests);
|
||||
m_FetchHandler.FetchRequest(requestinfo.request, osresponse, m_module.m_badRequests, requestinfo.thepoll.Id);
|
||||
requestinfo.request.InputStream.Dispose();
|
||||
|
||||
lock (responses)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user