aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-25 22:15:29 +0000
committerJustin Clark-Casey (justincc)2011-11-25 22:15:29 +0000
commit0688861aa72dc162a3da7b60804ac17ff5908067 (patch)
tree6a56468af2eeeb4fd825b82f89d825cfc75dcd8c /OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
parentFix WebFetchInventoryDescendents cap to use Utils.AssetTypeTostring/Inventory... (diff)
downloadopensim-SC_OLD-0688861aa72dc162a3da7b60804ac17ff5908067.zip
opensim-SC_OLD-0688861aa72dc162a3da7b60804ac17ff5908067.tar.gz
opensim-SC_OLD-0688861aa72dc162a3da7b60804ac17ff5908067.tar.bz2
opensim-SC_OLD-0688861aa72dc162a3da7b60804ac17ff5908067.tar.xz
Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem
Diffstat (limited to 'OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs')
-rw-r--r--OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
index 17dbcd5..52b5f2c 100644
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
@@ -235,10 +235,11 @@ namespace OpenSim.Capabilities.Handlers
235 llsdFolder.folder_id = invFolder.ID; 235 llsdFolder.folder_id = invFolder.ID;
236 llsdFolder.parent_id = invFolder.ParentID; 236 llsdFolder.parent_id = invFolder.ParentID;
237 llsdFolder.name = invFolder.Name; 237 llsdFolder.name = invFolder.Name;
238 if (invFolder.Type < 0 || invFolder.Type >= TaskInventoryItem.Types.Length) 238
239 if (!Enum.IsDefined(typeof(AssetType), invFolder.Type))
239 llsdFolder.type = "-1"; 240 llsdFolder.type = "-1";
240 else 241 else
241 llsdFolder.type = TaskInventoryItem.Types[invFolder.Type]; 242 llsdFolder.type = Utils.AssetTypeToString((AssetType)invFolder.Type);
242 llsdFolder.preferred_type = "-1"; 243 llsdFolder.preferred_type = "-1";
243 244
244 return llsdFolder; 245 return llsdFolder;