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/CoreModules/Avatar/Attachments
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_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.zip
opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.gz
opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.bz2
opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index d9a619d..48f3a23 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -461,7 +461,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
            SceneObjectGroup rezzedAtt = presence.GetAttachments()[0];
-            scene.IncomingCloseAgent(presence.UUID);
+            scene.IncomingCloseAgent(presence.UUID, false);
            // Check that we can't retrieve this attachment from the scene.
            Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null);
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/CoreModules/Avatar/Attachments
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_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.zip opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.gz opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.bz2 opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index d9a619d..48f3a23 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -461,7 +461,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
461		461
462	SceneObjectGroup rezzedAtt = presence.GetAttachments()[0];	462	SceneObjectGroup rezzedAtt = presence.GetAttachments()[0];
463		463
464	scene.IncomingCloseAgent(presence.UUID);	464	scene.IncomingCloseAgent(presence.UUID, false);
465		465
466	// Check that we can't retrieve this attachment from the scene.	466	// Check that we can't retrieve this attachment from the scene.
467	Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null);	467	Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null);