aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-30 00:29:52 +0000
committerJustin Clark-Casey (justincc)2013-03-30 00:29:52 +0000
commitf8785b5f4720a0da7993ce6014e46cb8aaad308a (patch)
tree1492d304d69ef5c8dc064cc819bc421789bb6747
parentrefactor: move the append magic number processing for attachments back up int... (diff)
downloadopensim-SC_OLD-f8785b5f4720a0da7993ce6014e46cb8aaad308a.zip
opensim-SC_OLD-f8785b5f4720a0da7993ce6014e46cb8aaad308a.tar.gz
opensim-SC_OLD-f8785b5f4720a0da7993ce6014e46cb8aaad308a.tar.bz2
opensim-SC_OLD-f8785b5f4720a0da7993ce6014e46cb8aaad308a.tar.xz
refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 764c982..3e69bf2 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1159,7 +1159,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1159 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize; 1159 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
1160 agent.ControllingClient.SendAgentAlertMessage( 1160 agent.ControllingClient.SendAgentAlertMessage(
1161 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false); 1161 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
1162 InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene); 1162 InformClientToInitiateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
1163 return true; 1163 return true;
1164 } 1164 }
1165 } 1165 }
@@ -1182,7 +1182,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1182 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize; 1182 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
1183 agent.ControllingClient.SendAgentAlertMessage( 1183 agent.ControllingClient.SendAgentAlertMessage(
1184 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false); 1184 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
1185 InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene); 1185 InformClientToInitiateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
1186 1186
1187 return true; 1187 return true;
1188 } 1188 }
@@ -1213,7 +1213,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1213 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize; 1213 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
1214 agent.ControllingClient.SendAgentAlertMessage( 1214 agent.ControllingClient.SendAgentAlertMessage(
1215 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false); 1215 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
1216 InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene); 1216 InformClientToInitiateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
1217 return true; 1217 return true;
1218 } 1218 }
1219 } 1219 }
@@ -1243,7 +1243,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1243 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize; 1243 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
1244 agent.ControllingClient.SendAgentAlertMessage( 1244 agent.ControllingClient.SendAgentAlertMessage(
1245 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false); 1245 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
1246 InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene); 1246 InformClientToInitiateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
1247 return true; 1247 return true;
1248 } 1248 }
1249 } 1249 }
@@ -1330,16 +1330,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1330 } 1330 }
1331 1331
1332 1332
1333 public delegate void InformClientToInitateTeleportToLocationDelegate(ScenePresence agent, uint regionX, uint regionY, 1333 public delegate void InformClientToInitiateTeleportToLocationDelegate(ScenePresence agent, uint regionX, uint regionY,
1334 Vector3 position, 1334 Vector3 position,
1335 Scene initiatingScene); 1335 Scene initiatingScene);
1336 1336
1337 private void InformClientToInitateTeleportToLocation(ScenePresence agent, uint regionX, uint regionY, Vector3 position, Scene initiatingScene) 1337 private void InformClientToInitiateTeleportToLocation(ScenePresence agent, uint regionX, uint regionY, Vector3 position, Scene initiatingScene)
1338 { 1338 {
1339 1339
1340 // This assumes that we know what our neighbours are. 1340 // This assumes that we know what our neighbours are.
1341 1341
1342 InformClientToInitateTeleportToLocationDelegate d = InformClientToInitiateTeleportToLocationAsync; 1342 InformClientToInitiateTeleportToLocationDelegate d = InformClientToInitiateTeleportToLocationAsync;
1343 d.BeginInvoke(agent, regionX, regionY, position, initiatingScene, 1343 d.BeginInvoke(agent, regionX, regionY, position, initiatingScene,
1344 InformClientToInitiateTeleportToLocationCompleted, 1344 InformClientToInitiateTeleportToLocationCompleted,
1345 d); 1345 d);
@@ -1401,8 +1401,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1401 1401
1402 private void InformClientToInitiateTeleportToLocationCompleted(IAsyncResult iar) 1402 private void InformClientToInitiateTeleportToLocationCompleted(IAsyncResult iar)
1403 { 1403 {
1404 InformClientToInitateTeleportToLocationDelegate icon = 1404 InformClientToInitiateTeleportToLocationDelegate icon =
1405 (InformClientToInitateTeleportToLocationDelegate)iar.AsyncState; 1405 (InformClientToInitiateTeleportToLocationDelegate)iar.AsyncState;
1406 icon.EndInvoke(iar); 1406 icon.EndInvoke(iar);
1407 } 1407 }
1408 1408