diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchLibDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchLibDescHandler.cs index 5daf0908df..4d64a74b1f 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchLibDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchLibDescHandler.cs @@ -58,7 +58,7 @@ namespace OpenSim.Capabilities.Handlers m_Scene = s; } - public void FetchRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, ExpiringKey BadRequests) + public void FetchRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, ExpiringKey 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); diff --git a/OpenSim/Region/ClientStack/Linden/Caps/FetchLibDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/FetchLibDescModule.cs index 385be6840d..bfa90c8f62 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/FetchLibDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/FetchLibDescModule.cs @@ -142,7 +142,7 @@ namespace OpenSim.Region.ClientStack.Linden m_badRequests = new ExpiringKey(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) diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index e82b2fec73..7e9e1034c7 100755 Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index ff091fa994..17f425d62f 100755 Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 5105afbbda..7469ad9c70 100755 Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index 1061cf9325..133d5faa1a 100755 Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ