diff options
| author | Melanie | 2013-02-27 20:40:48 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-27 20:40:48 +0000 |
| commit | ba0819be9ee4574e9cc5c05e94d21b449debba0a (patch) | |
| tree | ee4b494dabe14ea227d662844f483669d96a31d5 /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: remove some mono compiler warnings in script regression tests (diff) | |
| download | opensim-SC-ba0819be9ee4574e9cc5c05e94d21b449debba0a.zip opensim-SC-ba0819be9ee4574e9cc5c05e94d21b449debba0a.tar.gz opensim-SC-ba0819be9ee4574e9cc5c05e94d21b449debba0a.tar.bz2 opensim-SC-ba0819be9ee4574e9cc5c05e94d21b449debba0a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs | 1 |
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 | |||
| 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); |