OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.7.3-extended
Justin Clark-Casey (justincc) 2012-06-20 02:26:58 +01:00
parent 8eb39eb3ac
commit a6d97e6353
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
View File

@ -393,12 +393,8 @@ namespace OpenSim.Capabilities.Handlers
llsdFolder.folder_id = invFolder.ID; llsdFolder.folder_id = invFolder.ID;
llsdFolder.parent_id = invFolder.ParentID; llsdFolder.parent_id = invFolder.ParentID;
llsdFolder.name = invFolder.Name; llsdFolder.name = invFolder.Name;
llsdFolder.type = invFolder.Type;
if (invFolder.Type == (short)AssetType.Unknown || !Enum.IsDefined(typeof(AssetType), (sbyte)invFolder.Type)) llsdFolder.preferred_type = -1;
llsdFolder.type = "-1";
else
llsdFolder.type = Utils.AssetTypeToString((AssetType)invFolder.Type);
llsdFolder.preferred_type = "-1";
return llsdFolder; return llsdFolder;
} }

4
OpenSim/Capabilities/LLSDInventoryFolder.cs
View File

@ -35,7 +35,7 @@ namespace OpenSim.Framework.Capabilities
public UUID folder_id; public UUID folder_id;
public UUID parent_id; public UUID parent_id;
public string name; public string name;
public string type; public int type;
public string preferred_type; public int preferred_type;
} }
} }