aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.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/EntityTransferHelpers.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/EntityTransferHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs4
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
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 };