diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 35045b5..62acd78 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -844,7 +844,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
844 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); | 844 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); |
845 | TestClient tc = new TestClient(acd, sceneA); | 845 | TestClient tc = new TestClient(acd, sceneA); |
846 | List<TestClient> destinationTestClients = new List<TestClient>(); | 846 | List<TestClient> destinationTestClients = new List<TestClient>(); |
847 | EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients); | 847 | EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients); |
848 | 848 | ||
849 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd); | 849 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd); |
850 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); | 850 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); |
@@ -925,7 +925,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
925 | IConfig modulesConfig = config.AddConfig("Modules"); | 925 | IConfig modulesConfig = config.AddConfig("Modules"); |
926 | modulesConfig.Set("EntityTransferModule", etmA.Name); | 926 | modulesConfig.Set("EntityTransferModule", etmA.Name); |
927 | modulesConfig.Set("SimulationServices", lscm.Name); | 927 | modulesConfig.Set("SimulationServices", lscm.Name); |
928 | IConfig entityTransferConfig = config.AddConfig("EntityTransfer"); | ||
929 | 928 | ||
930 | modulesConfig.Set("InventoryAccessModule", "BasicInventoryAccessModule"); | 929 | modulesConfig.Set("InventoryAccessModule", "BasicInventoryAccessModule"); |
931 | 930 | ||
@@ -944,7 +943,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
944 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); | 943 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); |
945 | TestClient tc = new TestClient(acd, sceneA); | 944 | TestClient tc = new TestClient(acd, sceneA); |
946 | List<TestClient> destinationTestClients = new List<TestClient>(); | 945 | List<TestClient> destinationTestClients = new List<TestClient>(); |
947 | EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients); | 946 | EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients); |
948 | 947 | ||
949 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd); | 948 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd); |
950 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); | 949 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); |
@@ -966,7 +965,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
966 | // Both these operations will occur on different threads and will wait for each other. | 965 | // Both these operations will occur on different threads and will wait for each other. |
967 | // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1 | 966 | // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1 |
968 | // test protocol, where we are trying to avoid unpredictable async operations in regression tests. | 967 | // test protocol, where we are trying to avoid unpredictable async operations in regression tests. |
969 | ((TestClient)beforeTeleportSp.ControllingClient).OnTestClientSendRegionTeleport | 968 | tc.OnTestClientSendRegionTeleport |
970 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) | 969 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) |
971 | => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null); | 970 | => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null); |
972 | 971 | ||