Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
author: Melanie 2012-08-23 01:41:47 +0100
committer: Melanie 2012-08-23 01:41:47 +0100
commit: f8603a215d142f3b83a5ff1dc022b716b3e48f99 (patch)
tree: 49971f8e12efcfea18b4b2fdb6bd54c904d3f52c /OpenSim/Region/ClientStack/Linden/Caps/EventQueue
parent: Merge branch 'avination' into careminster (diff)
parent: this should be an if-else block in case the non-phys min/max are smaller than... (diff)
download: opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.zip
opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.gz
opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.bz2
opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.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 cd70410..d604cf6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
            UUID spId = TestHelpers.ParseTail(0x1);
            SceneHelpers.AddScenePresence(m_scene, spId);
-            m_scene.IncomingCloseAgent(spId);
+            m_scene.IncomingCloseAgent(spId, false);
            // TODO: Add more assertions for the other aspects of event queues
            Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));
author	Melanie	2012-08-23 01:41:47 +0100
committer	Melanie	2012-08-23 01:41:47 +0100
commit	f8603a215d142f3b83a5ff1dc022b716b3e48f99 (patch)
tree	49971f8e12efcfea18b4b2fdb6bd54c904d3f52c /OpenSim/Region/ClientStack/Linden/Caps/EventQueue
parent	Merge branch 'avination' into careminster (diff)
parent	this should be an if-else block in case the non-phys min/max are smaller than... (diff)
download	opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.zip opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.gz opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.bz2 opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.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 cd70410..d604cf6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
94	UUID spId = TestHelpers.ParseTail(0x1);	94	UUID spId = TestHelpers.ParseTail(0x1);
95		95
96	SceneHelpers.AddScenePresence(m_scene, spId);	96	SceneHelpers.AddScenePresence(m_scene, spId);
97	m_scene.IncomingCloseAgent(spId);	97	m_scene.IncomingCloseAgent(spId, false);
98		98
99	// TODO: Add more assertions for the other aspects of event queues	99	// TODO: Add more assertions for the other aspects of event queues
100	Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));	100	Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));