From 7677e53dba8ee335da46103a67df7667008c9756 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 3 Jan 2022 19:08:35 +0000 Subject: [PATCH] fix FetchInvDescHandler response categories fields --- .../Handlers/FetchInventory/FetchInvDescHandler.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index 0a8b082119..d48ef42a92 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs @@ -197,9 +197,11 @@ namespace OpenSim.Capabilities.Handlers invcollSet[i] = null; LLSDxmlEncode2.AddMap(lastresponse); - LLSDxmlEncode2.AddElem_agent_id(thiscoll.OwnerID, lastresponse); - LLSDxmlEncode2.AddElem("descendents", thiscoll.Descendents, lastresponse); LLSDxmlEncode2.AddElem_folder_id(thiscoll.FolderID, lastresponse); + LLSDxmlEncode2.AddElem_agent_id(thiscoll.OwnerID, lastresponse); + LLSDxmlEncode2.AddElem_owner_id(thiscoll.OwnerID, lastresponse); + LLSDxmlEncode2.AddElem("descendents", thiscoll.Descendents, lastresponse); + LLSDxmlEncode2.AddElem("version", thiscoll.Version, lastresponse); if (thiscoll.Folders == null || thiscoll.Folders.Count == 0) LLSDxmlEncode2.AddEmptyArray("categories", lastresponse); @@ -210,11 +212,10 @@ namespace OpenSim.Capabilities.Handlers { LLSDxmlEncode2.AddMap(lastresponse); - LLSDxmlEncode2.AddElem_folder_id(invFolder.ID, lastresponse); + LLSDxmlEncode2.AddElem("category_id", invFolder.ID, lastresponse); LLSDxmlEncode2.AddElem_parent_id(invFolder.ParentID, lastresponse); LLSDxmlEncode2.AddElem_name(invFolder.Name, lastresponse); - LLSDxmlEncode2.AddElem("type", invFolder.Type, lastresponse); - LLSDxmlEncode2.AddElem("preferred_type", (int)-1, lastresponse); + LLSDxmlEncode2.AddElem("type_default", invFolder.Type, lastresponse); LLSDxmlEncode2.AddElem("version", invFolder.Version, lastresponse); LLSDxmlEncode2.AddEndMap(lastresponse); @@ -235,8 +236,6 @@ namespace OpenSim.Capabilities.Handlers LLSDxmlEncode2.AddEndArray(lastresponse); } - LLSDxmlEncode2.AddElem_owner_id(thiscoll.OwnerID, lastresponse); - LLSDxmlEncode2.AddElem("version", thiscoll.Version, lastresponse); LLSDxmlEncode2.AddEndMap(lastresponse); invcollSet[i] = null;