aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
diff options
context:
space:
mode:
authorteravus2013-10-04 16:52:55 -0500
committerteravus2013-10-04 16:52:55 -0500
commit28d704599e94f4016a984b45db1ec328ff741573 (patch)
tree1881effba2b4417cbce3e39fe35d3319e5f3cf8b /OpenSim/Tests/Common/Helpers/SceneHelpers.cs
parentMerge branch 'master' of careminster:/var/git/careminster (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-28d704599e94f4016a984b45db1ec328ff741573.zip
opensim-SC_OLD-28d704599e94f4016a984b45db1ec328ff741573.tar.gz
opensim-SC_OLD-28d704599e94f4016a984b45db1ec328ff741573.tar.bz2
opensim-SC_OLD-28d704599e94f4016a984b45db1ec328ff741573.tar.xz
Merge branch 'master' of careminster:/var/git/careminster
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/SceneHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index d9bb85e..4cdfe98 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -548,7 +548,7 @@ namespace OpenSim.Tests.Common
548 Console.WriteLine("NewUserConnection failed: " + reason); 548 Console.WriteLine("NewUserConnection failed: " + reason);
549 549
550 // Stage 2: add the new client as a child agent to the scene 550 // Stage 2: add the new client as a child agent to the scene
551 scene.AddNewClient(client, PresenceType.User); 551 scene.AddNewAgent(client, PresenceType.User);
552 552
553 return scene.GetScenePresence(client.AgentId); 553 return scene.GetScenePresence(client.AgentId);
554 } 554 }