aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-04 00:20:27 +0000
committerJustin Clark-Casey (justincc)2012-02-04 00:20:27 +0000
commit9b762a5a84004c2d5585a34e2fc10f41a7e626fd (patch)
tree1f6a079be57b5084de5adc60dd0270bcd73505d2 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-9b762a5a84004c2d5585a34e2fc10f41a7e626fd.zip
opensim-SC-9b762a5a84004c2d5585a34e2fc10f41a7e626fd.tar.gz
opensim-SC-9b762a5a84004c2d5585a34e2fc10f41a7e626fd.tar.bz2
opensim-SC-9b762a5a84004c2d5585a34e2fc10f41a7e626fd.tar.xz
Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if we have been passed a non-zero transaction ID.
This resolves the recent regression from deeb728 where notecards could not be saved in prim inventories. This looks like a better solution than deeb728 since only non-caps updates pass in a transaction ID. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5873
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
index 6f99abd..c582cf6 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
49// log4net.Config.XmlConfigurator.Configure(); 49// log4net.Config.XmlConfigurator.Configure();
50 50
51 UUID userId = TestHelpers.ParseTail(0x1); 51 UUID userId = TestHelpers.ParseTail(0x1);
52 UUID itemId = TestHelpers.ParseTail(0x2); 52// UUID itemId = TestHelpers.ParseTail(0x2);
53 string itemName = "Test Script Item"; 53 string itemName = "Test Script Item";
54 54
55 Scene scene = SceneHelpers.SetupScene(); 55 Scene scene = SceneHelpers.SetupScene();