diff options
| author | Melanie | 2009-12-29 18:41:45 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-29 18:41:45 +0000 |
| commit | 67cfac0cf15d873666d2bbf5e2178d4242d702b4 (patch) | |
| tree | ae27113d3b127d6eccaa189cc601f3b6ab714788 /OpenSim/Region/Framework/Scenes/Tests | |
| parent | One should not copy/paste so much :) (diff) | |
| parent | Change teleports so the TeleportFlags are sent to the destination sim. It (diff) | |
| download | opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.zip opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.gz opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.bz2 opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index f495022..f00dd66 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
| @@ -117,7 +117,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 117 | agent.child = true; | 117 | agent.child = true; |
| 118 | 118 | ||
| 119 | string reason; | 119 | string reason; |
| 120 | scene.NewUserConnection(agent, out reason); | 120 | scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason); |
| 121 | testclient = new TestClient(agent, scene); | 121 | testclient = new TestClient(agent, scene); |
| 122 | scene.AddNewClient(testclient); | 122 | scene.AddNewClient(testclient); |
| 123 | 123 | ||
| @@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 153 | if (acd1 == null) | 153 | if (acd1 == null) |
| 154 | fixNullPresence(); | 154 | fixNullPresence(); |
| 155 | 155 | ||
| 156 | scene.NewUserConnection(acd1, out reason); | 156 | scene.NewUserConnection(acd1, 0, out reason); |
| 157 | if (testclient == null) | 157 | if (testclient == null) |
| 158 | testclient = new TestClient(acd1, scene); | 158 | testclient = new TestClient(acd1, scene); |
| 159 | scene.AddNewClient(testclient); | 159 | scene.AddNewClient(testclient); |
| @@ -242,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 242 | 242 | ||
| 243 | // Adding child agent to region 1001 | 243 | // Adding child agent to region 1001 |
| 244 | string reason; | 244 | string reason; |
| 245 | scene2.NewUserConnection(acd1, out reason); | 245 | scene2.NewUserConnection(acd1,0, out reason); |
| 246 | scene2.AddNewClient(testclient); | 246 | scene2.AddNewClient(testclient); |
| 247 | 247 | ||
| 248 | ScenePresence presence = scene.GetScenePresence(agent1); | 248 | ScenePresence presence = scene.GetScenePresence(agent1); |