aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorAdam Johnson2007-12-07 08:54:31 +0000
committerAdam Johnson2007-12-07 08:54:31 +0000
commit3d938f76b7c2f8ede862f9979383d79dfb21372c (patch)
tree0c99beb3affa959f596e079f20ed806364e3d3dc /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
parent* Added hacked support for 'anyone can move' and 'anyone can copy'. (diff)
downloadopensim-SC_OLD-3d938f76b7c2f8ede862f9979383d79dfb21372c.zip
opensim-SC_OLD-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.gz
opensim-SC_OLD-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.bz2
opensim-SC_OLD-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.xz
Updates to LibSL revision 1498. Thanks Johan!
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs4
1 files changed, 2 insertions, 2 deletions
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
144 144
145 if (transactions != null) 145 if (transactions != null)
146 { 146 {
147 LLUUID assetID = transactionID.Combine(remoteClient.SecureSessionId); 147 LLUUID assetID = libsecondlife.LLUUID.Combine(transactionID, remoteClient.SecureSessionId);
148 AssetBase asset = AssetCache.GetAsset(assetID); 148 AssetBase asset = AssetCache.GetAsset(assetID);
149 149
150 if (asset == null) 150 if (asset == null)
@@ -432,7 +432,7 @@ namespace OpenSim.Region.Environment.Scenes
432 ((SceneObjectGroup) selectedEnt).GetPartName(selectedEnt.LocalId), 432 ((SceneObjectGroup) selectedEnt).GetPartName(selectedEnt.LocalId),
433 ((SceneObjectGroup) selectedEnt).GetPartDescription(selectedEnt.LocalId), 433 ((SceneObjectGroup) selectedEnt).GetPartDescription(selectedEnt.LocalId),
434 (sbyte) InventoryType.Object, 434 (sbyte) InventoryType.Object,
435 (sbyte) AssetType.Object, // TODO: after libSL r1357, this becomes AssetType.Primitive 435 (sbyte) AssetType.Primitive,
436 Helpers.StringToField(sceneObjectXml)); 436 Helpers.StringToField(sceneObjectXml));
437 AssetCache.AddAsset(asset); 437 AssetCache.AddAsset(asset);
438 438