From 3d938f76b7c2f8ede862f9979383d79dfb21372c Mon Sep 17 00:00:00 2001
From: Adam Johnson
Date: Fri, 7 Dec 2007 08:54:31 +0000
Subject: Updates to LibSL revision 1498. Thanks Johan!

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 6c8b3bf..ac504e1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Environment.Scenes
                         
                         if (transactions != null)
                         {
-                            LLUUID assetID = transactionID.Combine(remoteClient.SecureSessionId);                            
+                            LLUUID assetID = libsecondlife.LLUUID.Combine(transactionID, remoteClient.SecureSessionId);                            
                             AssetBase asset = AssetCache.GetAsset(assetID);
                             
                             if (asset == null)
@@ -432,7 +432,7 @@ namespace OpenSim.Region.Environment.Scenes
                                     ((SceneObjectGroup) selectedEnt).GetPartName(selectedEnt.LocalId),
                                     ((SceneObjectGroup) selectedEnt).GetPartDescription(selectedEnt.LocalId),
                                     (sbyte) InventoryType.Object,
-                                    (sbyte) AssetType.Object, // TODO: after libSL r1357, this becomes AssetType.Primitive
+                                    (sbyte) AssetType.Primitive,
                                     Helpers.StringToField(sceneObjectXml));
                                 AssetCache.AddAsset(asset);
 
-- 
cgit v1.1