aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2010-08-16 12:03:13 -0700
committerDiva Canto2010-08-16 12:03:13 -0700
commit69ad04cdf6ca899877a38fd4f9248f4107e3a7ce (patch)
tree4e43eb3381bd56efb2e20e040ee469c8ffd715a7 /OpenSim/Region/CoreModules
parentAdded SendTeleportProgress to IClientAPI. Ya know what that means... 8 files ... (diff)
downloadopensim-SC-69ad04cdf6ca899877a38fd4f9248f4107e3a7ce.zip
opensim-SC-69ad04cdf6ca899877a38fd4f9248f4107e3a7ce.tar.gz
opensim-SC-69ad04cdf6ca899877a38fd4f9248f4107e3a7ce.tar.bz2
opensim-SC-69ad04cdf6ca899877a38fd4f9248f4107e3a7ce.tar.xz
Attempt at sending TeleportProgress, but it doesn't seem to be doing anything at all. Left it commented, just as a reminder for where those messages could be sent.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 751d49a..bb98dba 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -317,6 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
317 317
318 if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) 318 if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY))
319 { 319 {
320 //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
320 321
321 #region IP Translation for NAT 322 #region IP Translation for NAT
322 IClientIPEndpoint ipepClient; 323 IClientIPEndpoint ipepClient;
@@ -395,6 +396,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
395 agent.Position = position; 396 agent.Position = position;
396 SetCallbackURL(agent, sp.Scene.RegionInfo); 397 SetCallbackURL(agent, sp.Scene.RegionInfo);
397 398
399 //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Updating agent...");
400
398 if (!UpdateAgent(reg, finalDestination, agent)) 401 if (!UpdateAgent(reg, finalDestination, agent))
399 { 402 {
400 // Region doesn't take it 403 // Region doesn't take it