aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-08 14:39:29 +0000
committerJustin Clarke Casey2008-04-08 14:39:29 +0000
commit90422db35a9540a5eabfca0ede239d7efc36c83e (patch)
treef90e3653af8f8e8f509d55a364daf6a411bb9e01 /OpenSim
parentnew compile of libsecondlife (libsecondlife2.dll in root folder) for justincc. (diff)
downloadopensim-SC_OLD-90422db35a9540a5eabfca0ede239d7efc36c83e.zip
opensim-SC_OLD-90422db35a9540a5eabfca0ede239d7efc36c83e.tar.gz
opensim-SC_OLD-90422db35a9540a5eabfca0ede239d7efc36c83e.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs11
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
3 files changed, 3 insertions, 12 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;
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 4abfc5a..1250f53 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.Communications
326 folder.AgentID = user; 326 folder.AgentID = user;
327 folder.ID = LLUUID.Random(); 327 folder.ID = LLUUID.Random();
328 folder.Name = "Objects"; 328 folder.Name = "Objects";
329 folder.Type = (short)AssetType.Primitive; 329 folder.Type = (short)AssetType.Object;
330 folder.Version = 1; 330 folder.Version = 1;
331 Folders.Add(folder.ID, folder); 331 Folders.Add(folder.ID, folder);
332 332
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 87f7ace..bc8fb59 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -858,7 +858,7 @@ namespace OpenSim.Region.Environment.Scenes
858 ((SceneObjectGroup) selectedEnt).GetPartName(selectedEnt.LocalId), 858 ((SceneObjectGroup) selectedEnt).GetPartName(selectedEnt.LocalId),
859 ((SceneObjectGroup) selectedEnt).GetPartDescription(selectedEnt.LocalId), 859 ((SceneObjectGroup) selectedEnt).GetPartDescription(selectedEnt.LocalId),
860 (sbyte) InventoryType.Object, 860 (sbyte) InventoryType.Object,
861 (sbyte) AssetType.Primitive, 861 (sbyte) AssetType.Object,
862 Helpers.StringToField(sceneObjectXml)); 862 Helpers.StringToField(sceneObjectXml));
863 AssetCache.AddAsset(asset); 863 AssetCache.AddAsset(asset);
864 864