diff options
Diffstat (limited to '')
3 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 98b0f97..85b5da0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -1054,12 +1054,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1054 | newpos.Y = enterDistance; | 1054 | newpos.Y = enterDistance; |
1055 | } | 1055 | } |
1056 | 1056 | ||
1057 | Vector3 vel = agent.Velocity; | ||
1058 | |||
1059 | CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync; | 1057 | CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync; |
1060 | d.BeginInvoke(agent, newpos, neighbourx, neighboury, isFlying, CrossAgentToNewRegionCompleted, d); | 1058 | d.BeginInvoke(agent, newpos, neighbourx, neighboury, isFlying, CrossAgentToNewRegionCompleted, d); |
1061 | |||
1062 | |||
1063 | } | 1059 | } |
1064 | 1060 | ||
1065 | public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, bool isFlying); | 1061 | public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, bool isFlying); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 433b74a..1d37e38 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -66,11 +66,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
66 | scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000, cm); | 66 | scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000, cm); |
67 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); | 67 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); |
68 | 68 | ||
69 | IRegionModule interregionComms = new RESTInterregionComms(); | 69 | IRegionModule interregionComms = new RESTInterregionComms(); |
70 | interregionComms.Initialise(scene, new IniConfigSource()); | 70 | interregionComms.Initialise(scene, new IniConfigSource()); |
71 | interregionComms.Initialise(scene2, new IniConfigSource()); | 71 | interregionComms.Initialise(scene2, new IniConfigSource()); |
72 | interregionComms.Initialise(scene3, new IniConfigSource()); | 72 | interregionComms.Initialise(scene3, new IniConfigSource()); |
73 | interregionComms.PostInitialise(); | 73 | interregionComms.PostInitialise(); |
74 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); | 74 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); |
75 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); | 75 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); |
76 | SceneSetupHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms); | 76 | SceneSetupHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index fc91016..e092334 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
80 | 80 | ||
81 | // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used. | 81 | // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used. |
82 | client.TeleportTargetScene = sceneB; | 82 | client.TeleportTargetScene = sceneB; |
83 | // Commenting this out for now -- Diva | 83 | // Commenting this out for now -- Diva |
84 | //client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40)); | 84 | //client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40)); |
85 | 85 | ||
86 | //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB"); | 86 | //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB"); |
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
93 | // "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", | 93 | // "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", |
94 | // Is.EqualTo(client.CapsSeedUrl), | 94 | // Is.EqualTo(client.CapsSeedUrl), |
95 | // "Incorrect caps object path set up in sceneB"); | 95 | // "Incorrect caps object path set up in sceneB"); |
96 | // ---- up to here -- Diva | 96 | // ---- up to here -- Diva |
97 | 97 | ||
98 | // This assertion will currently fail since we don't remove the caps paths when no longer needed | 98 | // This assertion will currently fail since we don't remove the caps paths when no longer needed |
99 | //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path"); | 99 | //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path"); |