From 1e5881386eb2b15fd2c7961ed23b12591387464e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 23 Apr 2022 23:27:47 +0100 Subject: [PATCH] fix agent_id on FetchLibDesc.. this is just a formal fix, viewers seem to just ignore it. --- .../FetchInventory/FetchLibDescHandler.cs | 4 ++-- .../Linden/Caps/FetchLibDescModule.cs | 6 +++--- bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 20480 -> 20480 bytes bin/OpenMetaverse.StructuredData.dll | Bin 126976 -> 126976 bytes bin/OpenMetaverse.dll | Bin 2170880 -> 2170880 bytes bin/OpenMetaverseTypes.dll | Bin 163840 -> 163840 bytes 6 files changed, 5 insertions(+), 5 deletions(-) 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 e82b2fec732ae9c0904501281f6d05ceecec1af6..7e9e1034c70ce50dcc5f7a5bb66efe03d959f17a 100755 GIT binary patch delta 45 zcmV+|0Mh?}paFoO0g#9S%V4pJaw7t)mb3mNss|9sZ*NYM95_mfF8Jf^Rj)X+xGP8` D#!3_w delta 45 zcmV+|0Mh?}paFoO0g#9SV_C6^aw7uxlC%CJss|9utVmX}_O?m6L#p{_{~?sKxGP8` D*gh44 diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index ff091fa99439b11eafffe833c79b617df8937947..17f425d62fc9642763018c9ac830f2536c45575d 100755 GIT binary patch delta 41 zcmV+^0M`G2;0J)<2at#Y$zXwswTb~As1R$U!^-cjze$&Qp3lzlYHPQ+r~ybvuYMIQ delta 41 zcmV+^0M`G2;0J)<2at#YVOfESwTb~As1VscH3GAH_D`aj?=d+=YrVI)r~ybvdY%$3 diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 5105afbbda1d727581ddebfd86b08eee449ca706..7469ad9c70b2ab214a957dd585eae2a9bb095417 100755 GIT binary patch delta 166 zcmWN=I}X7B00!W;N=39a?D8LvP2Nf^@s$ddKfoU)UX2Beo2Q^R!3t$l}fn~4)R>2xr z2OC!!OJ9Vp9r#AH8Er*PFYw#0r9YM1>$^TqPUb9}F79XB8FxHq+_fI+NE%9gX>fVV LpNuE;-cS1jP*X+m diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index 1061cf932548b4cd0ae319f840a475c8ece12a2b..133d5faa1ab9ae27372b2273ba2b7bd7c344e88f 100755 GIT binary patch delta 6442 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