aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 9ff35c0..887a8da 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Environment.Scenes
579 /// <param name="lookAt"></param> 579 /// <param name="lookAt"></param>
580 /// <param name="flags"></param> 580 /// <param name="flags"></param>
581 public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position, 581 public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
582 Vector3 lookAt, uint flags) 582 Vector3 lookAt, uint teleportFlags)
583 { 583 {
584 bool destRegionUp = false; 584 bool destRegionUp = false;
585 585
@@ -604,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes
604 position.Z = newPosZ; 604 position.Z = newPosZ;
605 } 605 }
606 avatar.ControllingClient.SendTeleportLocationStart(); 606 avatar.ControllingClient.SendTeleportLocationStart();
607 avatar.ControllingClient.SendLocalTeleport(position, lookAt, flags); 607 avatar.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
608 avatar.Teleport(position); 608 avatar.Teleport(position);
609 } 609 }
610 else 610 else
@@ -662,7 +662,7 @@ namespace OpenSim.Region.Environment.Scenes
662 m_log.DebugFormat( 662 m_log.DebugFormat(
663 "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); 663 "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);
664 664
665 avatar.ControllingClient.SendRegionTeleport(reg.RegionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), 665 avatar.ControllingClient.SendRegionTeleport(reg.RegionHandle, 13, reg.ExternalEndPoint, 4, teleportFlags,
666 capsPath); 666 capsPath);
667 avatar.MakeChildAgent(); 667 avatar.MakeChildAgent();
668 Thread.Sleep(5000); 668 Thread.Sleep(5000);
@@ -716,6 +716,12 @@ namespace OpenSim.Region.Environment.Scenes
716 return m_commsProvider.GridService.GetGridSettings(); 716 return m_commsProvider.GridService.GetGridSettings();
717 } 717 }
718 718
719 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
720 {
721 m_commsProvider.LogOffUser(userid, regionid, regionhandle, position, lookat);
722 }
723
724 // deprecated as of 2008-08-27
719 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz) 725 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
720 { 726 {
721 m_commsProvider.LogOffUser(userid, regionid, regionhandle, posx, posy, posz); 727 m_commsProvider.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);