Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
author: Melanie 2013-10-04 20:03:12 +0100
committer: Melanie 2013-10-04 20:03:12 +0100
commit: 75c68fa29e3a2fed81c883e7925bf161e968639f (patch)
tree: 13ba69e6818f634018a5954d38750cf48128b7f8 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
parent: Merge branch 'avination-current' into careminster (diff)
parent: minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff)
download: opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.zip
opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.gz
opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.bz2
opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index b3b0b8a..9e24bce 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
            UUID spId = TestHelpers.ParseTail(0x1);
            SceneHelpers.AddScenePresence(m_scene, spId);
-            m_scene.IncomingCloseAgent(spId, false);
+            m_scene.CloseAgent(spId, false);
            // TODO: Add more assertions for the other aspects of event queues
            Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));
author	Melanie	2013-10-04 20:03:12 +0100
committer	Melanie	2013-10-04 20:03:12 +0100
commit	75c68fa29e3a2fed81c883e7925bf161e968639f (patch)
tree	13ba69e6818f634018a5954d38750cf48128b7f8 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
parent	Merge branch 'avination-current' into careminster (diff)
parent	minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff)
download	opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.zip opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.gz opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.bz2 opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.xz

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs index b3b0b8a..9e24bce 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
96	UUID spId = TestHelpers.ParseTail(0x1);	96	UUID spId = TestHelpers.ParseTail(0x1);
97		97
98	SceneHelpers.AddScenePresence(m_scene, spId);	98	SceneHelpers.AddScenePresence(m_scene, spId);
99	m_scene.IncomingCloseAgent(spId, false);	99	m_scene.CloseAgent(spId, false);
100		100
101	// TODO: Add more assertions for the other aspects of event queues	101	// TODO: Add more assertions for the other aspects of event queues
102	Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));	102	Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));