Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2013-02-27 20:50:03 -0800
committer: Diva Canto 2013-02-27 20:50:03 -0800
commit: 64b8ce73dabcf651beadcc11cbe94db69cc3ea0e (patch)
tree: ab7f3a63c166185a5fd9d6d5a7e36a18d63a9817 /OpenSim/Region/ScriptEngine/Shared/Instance
parent: Moved the HG default variables out of [Startup] and into their own section [H... (diff)
parent: Add comment to example region modules about need to add Assembly annotation i... (diff)
download: opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.zip
opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.gz
opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.bz2
opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
index 7ea30bf1..ac822c6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
@@ -443,7 +443,6 @@ default
            string itemName = "TestNoStop";
            SceneObjectPart partWhereRezzed = CreateScript(script, itemName, userId);
-            TaskInventoryItem rezzedItem = partWhereRezzed.Inventory.GetInventoryItem(itemName);
            // Wait for the script to start the event before we try stopping it.
            m_chatEvent.WaitOne(60000);
author	Diva Canto	2013-02-27 20:50:03 -0800
committer	Diva Canto	2013-02-27 20:50:03 -0800
commit	64b8ce73dabcf651beadcc11cbe94db69cc3ea0e (patch)
tree	ab7f3a63c166185a5fd9d6d5a7e36a18d63a9817 /OpenSim/Region/ScriptEngine/Shared/Instance
parent	Moved the HG default variables out of [Startup] and into their own section [H... (diff)
parent	Add comment to example region modules about need to add Assembly annotation i... (diff)
download	opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.zip opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.gz opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.bz2 opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs index 7ea30bf1..ac822c6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
@@ -443,7 +443,6 @@ default
443	string itemName = "TestNoStop";	443	string itemName = "TestNoStop";
444		444
445	SceneObjectPart partWhereRezzed = CreateScript(script, itemName, userId);	445	SceneObjectPart partWhereRezzed = CreateScript(script, itemName, userId);
446	TaskInventoryItem rezzedItem = partWhereRezzed.Inventory.GetInventoryItem(itemName);
447		446
448	// Wait for the script to start the event before we try stopping it.	447	// Wait for the script to start the event before we try stopping it.
449	m_chatEvent.WaitOne(60000);	448	m_chatEvent.WaitOne(60000);