aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-26 14:28:24 +0000
committerJustin Clarke Casey2008-09-26 14:28:24 +0000
commit7ee1f3dff64144050cc0f0f5e9e89fe68ccc0ae0 (patch)
treeaa4bd0710a0e892e40c3cb43c1a0f179a9283b31 /OpenSim/Region/Environment/Scenes
parentAnd another file (diff)
downloadopensim-SC_OLD-7ee1f3dff64144050cc0f0f5e9e89fe68ccc0ae0.zip
opensim-SC_OLD-7ee1f3dff64144050cc0f0f5e9e89fe68ccc0ae0.tar.gz
opensim-SC_OLD-7ee1f3dff64144050cc0f0f5e9e89fe68ccc0ae0.tar.bz2
opensim-SC_OLD-7ee1f3dff64144050cc0f0f5e9e89fe68ccc0ae0.tar.xz
* Implment task inventory item asset update for the old non CAPS transaction system
* This means that saving notecards in prim inventories should now work. * Not the nicest code in the world - the transactions system is pretty fugly right now * PLEASE NOTE: Currently, the prim will not repersist until up to 15 seconds after it is unselected. * What we really need is a proper mechanism so that any prim updates still waiting when the simulator is quit are performed before exit.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 8fec13f..186e13e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1256,12 +1256,13 @@ namespace OpenSim.Region.Environment.Scenes
1256 } 1256 }
1257 } 1257 }
1258 else // Updating existing item with new perms etc 1258 else // Updating existing item with new perms etc
1259 { 1259 {
1260 TaskInventoryItem prevItem = part.GetInventoryItem(itemID); 1260 IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
1261System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.ToString(), itemInfo.AssetID.ToString()); 1261 if (agentTransactions != null)
1262 itemInfo.AssetID = prevItem.AssetID; 1262 {
1263 if (part.UpdateInventoryItem(itemInfo)) 1263 agentTransactions.HandleTaskItemUpdateFromTransaction(
1264 part.GetProperties(remoteClient); 1264 remoteClient, part, transactionID, currentItem);
1265 }
1265 } 1266 }
1266 } 1267 }
1267 else 1268 else