aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-02-25 20:30:03 +0000
committerJustin Clark-Casey (justincc)2015-02-25 20:30:03 +0000
commitb1b72d7c2f16e7d1e239a0579dc0b28ea9812ed7 (patch)
treee271b19776ad3a956730a947af3764de2c645431 /OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
parentOn shutdown (job engine stop), don't allow the ObjectDisposedException on Blo... (diff)
downloadopensim-SC_OLD-b1b72d7c2f16e7d1e239a0579dc0b28ea9812ed7.zip
opensim-SC_OLD-b1b72d7c2f16e7d1e239a0579dc0b28ea9812ed7.tar.gz
opensim-SC_OLD-b1b72d7c2f16e7d1e239a0579dc0b28ea9812ed7.tar.bz2
opensim-SC_OLD-b1b72d7c2f16e7d1e239a0579dc0b28ea9812ed7.tar.xz
Reduce coupling in regression test task inventory creation methods to make them usable in tests with no scene present
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 5fb995b..f0dc238 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -546,7 +546,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
546 SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10); 546 SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10);
547 TaskInventoryItem scriptItem 547 TaskInventoryItem scriptItem
548 = TaskInventoryHelpers.AddScript( 548 = TaskInventoryHelpers.AddScript(
549 scene, 549 scene.AssetService,
550 so.RootPart, 550 so.RootPart,
551 "scriptItem", 551 "scriptItem",
552 "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }"); 552 "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }");
@@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
659 SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10); 659 SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10);
660 TaskInventoryItem scriptTaskItem 660 TaskInventoryItem scriptTaskItem
661 = TaskInventoryHelpers.AddScript( 661 = TaskInventoryHelpers.AddScript(
662 scene, 662 scene.AssetService,
663 so.RootPart, 663 so.RootPart,
664 "scriptItem", 664 "scriptItem",
665 "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }"); 665 "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }");