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/Tests/Common/Helpers/EntityTransferHelpers.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, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index ff6608d..52a17e7 100644
--- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Common
                TestClient neighbourTc = new TestClient(newAgent, neighbourScene);
                neighbourTcs.Add(neighbourTc);
-                neighbourScene.AddNewClient(neighbourTc, PresenceType.User);
+                neighbourScene.AddNewAgent(neighbourTc, PresenceType.User);
            };
        }
@@ -119,7 +119,7 @@ namespace OpenSim.Tests.Common
                TestClient destinationClient = new TestClient(newAgent, destinationScene);
                destinationClients.Add(destinationClient);
-                destinationScene.AddNewClient(destinationClient, PresenceType.User);
+                destinationScene.AddNewAgent(destinationClient, PresenceType.User);
                ThreadPool.UnsafeQueueUserWorkItem(o => destinationClient.CompleteMovement(), null);
            };
author	Melanie	2013-10-04 20:03:12 +0100
committer	Melanie	2013-10-04 20:03:12 +0100
commit	75c68fa29e3a2fed81c883e7925bf161e968639f (patch)
tree	13ba69e6818f634018a5954d38750cf48128b7f8 /OpenSim/Tests/Common/Helpers/EntityTransferHelpers.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/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs index ff6608d..52a17e7 100644 --- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Common
84		84
85	TestClient neighbourTc = new TestClient(newAgent, neighbourScene);	85	TestClient neighbourTc = new TestClient(newAgent, neighbourScene);
86	neighbourTcs.Add(neighbourTc);	86	neighbourTcs.Add(neighbourTc);
87	neighbourScene.AddNewClient(neighbourTc, PresenceType.User);	87	neighbourScene.AddNewAgent(neighbourTc, PresenceType.User);
88	};	88	};
89	}	89	}
90		90
@@ -119,7 +119,7 @@ namespace OpenSim.Tests.Common
119		119
120	TestClient destinationClient = new TestClient(newAgent, destinationScene);	120	TestClient destinationClient = new TestClient(newAgent, destinationScene);
121	destinationClients.Add(destinationClient);	121	destinationClients.Add(destinationClient);
122	destinationScene.AddNewClient(destinationClient, PresenceType.User);	122	destinationScene.AddNewAgent(destinationClient, PresenceType.User);
123		123
124	ThreadPool.UnsafeQueueUserWorkItem(o => destinationClient.CompleteMovement(), null);	124	ThreadPool.UnsafeQueueUserWorkItem(o => destinationClient.CompleteMovement(), null);
125	};	125	};