diff options
author | Justin Clarke Casey | 2008-04-08 14:39:29 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-08 14:39:29 +0000 |
commit | 90422db35a9540a5eabfca0ede239d7efc36c83e (patch) | |
tree | f90e3653af8f8e8f509d55a364daf6a411bb9e01 /OpenSim/Framework/Communications/Capabilities | |
parent | new compile of libsecondlife (libsecondlife2.dll in root folder) for justincc. (diff) | |
download | opensim-SC-90422db35a9540a5eabfca0ede239d7efc36c83e.zip opensim-SC-90422db35a9540a5eabfca0ede239d7efc36c83e.tar.gz opensim-SC-90422db35a9540a5eabfca0ede239d7efc36c83e.tar.bz2 opensim-SC-90422db35a9540a5eabfca0ede239d7efc36c83e.tar.xz |
* Update code to use patched libsecondlife.dll which removes the problem where the AssetType enum was 'Primitive' rather than 'Object'
* The libsecondlife patch was also applied to libsecondlife itself in r1714
* Many, many thanks to Dr Schofield (IBM) for his help on this :)
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 315daab..36bebe8 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -301,16 +301,7 @@ namespace OpenSim.Region.Capabilities | |||
301 | llsdItem.item_id = invItem.ID; | 301 | llsdItem.item_id = invItem.ID; |
302 | llsdItem.name = invItem.Name; | 302 | llsdItem.name = invItem.Name; |
303 | llsdItem.parent_id = invItem.Folder; | 303 | llsdItem.parent_id = invItem.Folder; |
304 | llsdItem.type = Enum.GetName(typeof(AssetType), invItem.AssetType).ToLower(); | 304 | llsdItem.type = Enum.GetName(typeof(AssetType), invItem.AssetType).ToLower(); |
305 | |||
306 | // XXX Temporary fix for 'objects not appearing in inventory' problem. The asset type from libsecondlife is | ||
307 | // returning "primitive" when it should returning "object"! It looks like this is fixed in the latest libsecondlife, | ||
308 | // but our own libsl1550 doesn't have it either! | ||
309 | if ("primitive".Equals(llsdItem.type)) | ||
310 | { | ||
311 | llsdItem.type = "object"; | ||
312 | } | ||
313 | |||
314 | llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.InvType).ToLower(); | 305 | llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.InvType).ToLower(); |
315 | llsdItem.permissions = new LLSDPermissions(); | 306 | llsdItem.permissions = new LLSDPermissions(); |
316 | llsdItem.permissions.creator_id = invItem.Creator; | 307 | llsdItem.permissions.creator_id = invItem.Creator; |