aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-20 02:26:58 +0100
committerJustin Clark-Casey (justincc)2012-06-20 02:28:00 +0100
commitb23425c7c499d423235a724bc10c2cccc823132c (patch)
tree5815c38b43bba285e910ddd096d451c1625091a6
parentLower warn logging on not having friends/group module on permissions to debug. (diff)
downloadopensim-SC_OLD-b23425c7c499d423235a724bc10c2cccc823132c.zip
opensim-SC_OLD-b23425c7c499d423235a724bc10c2cccc823132c.tar.gz
opensim-SC_OLD-b23425c7c499d423235a724bc10c2cccc823132c.tar.bz2
opensim-SC_OLD-b23425c7c499d423235a724bc10c2cccc823132c.tar.xz
As with LLSDInventoryItem from commit 01a2b0b, send type values in LLSDInventoryFolder for inventory CAPs as integers rather than strings.
Should also resolve some issues with exceptions being thrown in some inventory fetches.
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs8
-rw-r--r--OpenSim/Capabilities/LLSDInventoryFolder.cs4
2 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
index 849cad2..515637e 100644
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
@@ -393,12 +393,8 @@ namespace OpenSim.Capabilities.Handlers
393 llsdFolder.folder_id = invFolder.ID; 393 llsdFolder.folder_id = invFolder.ID;
394 llsdFolder.parent_id = invFolder.ParentID; 394 llsdFolder.parent_id = invFolder.ParentID;
395 llsdFolder.name = invFolder.Name; 395 llsdFolder.name = invFolder.Name;
396 396 llsdFolder.type = invFolder.Type;
397 if (invFolder.Type == (short)AssetType.Unknown || !Enum.IsDefined(typeof(AssetType), (sbyte)invFolder.Type)) 397 llsdFolder.preferred_type = -1;
398 llsdFolder.type = "-1";
399 else
400 llsdFolder.type = Utils.AssetTypeToString((AssetType)invFolder.Type);
401 llsdFolder.preferred_type = "-1";
402 398
403 return llsdFolder; 399 return llsdFolder;
404 } 400 }
diff --git a/OpenSim/Capabilities/LLSDInventoryFolder.cs b/OpenSim/Capabilities/LLSDInventoryFolder.cs
index 3c216e9..d085430 100644
--- a/OpenSim/Capabilities/LLSDInventoryFolder.cs
+++ b/OpenSim/Capabilities/LLSDInventoryFolder.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Capabilities
35 public UUID folder_id; 35 public UUID folder_id;
36 public UUID parent_id; 36 public UUID parent_id;
37 public string name; 37 public string name;
38 public string type; 38 public int type;
39 public string preferred_type; 39 public int preferred_type;
40 } 40 }
41} 41}