diff options
author | Diva Canto | 2010-01-18 16:34:23 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-18 16:34:23 -0800 |
commit | 3d536944153d4931cf891d6a788a47484f3e6f4d (patch) | |
tree | 53802c5f051e8fbb089aeed02e0b9de760fabd8a /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | * Added missing GatekeeperServiceConnector (diff) | |
download | opensim-SC_OLD-3d536944153d4931cf891d6a788a47484f3e6f4d.zip opensim-SC_OLD-3d536944153d4931cf891d6a788a47484f3e6f4d.tar.gz opensim-SC_OLD-3d536944153d4931cf891d6a788a47484f3e6f4d.tar.bz2 opensim-SC_OLD-3d536944153d4931cf891d6a788a47484f3e6f4d.tar.xz |
Go Home works. With security!!
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index e85f270..ed8c0fd 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -134,8 +134,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
134 | if (!sp.Scene.Permissions.CanTeleport(sp.UUID)) | 134 | if (!sp.Scene.Permissions.CanTeleport(sp.UUID)) |
135 | return; | 135 | return; |
136 | 136 | ||
137 | bool destRegionUp = true; | ||
138 | |||
139 | IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>(); | 137 | IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>(); |
140 | 138 | ||
141 | // Reset animations; the viewer does that in teleports. | 139 | // Reset animations; the viewer does that in teleports. |
@@ -240,8 +238,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
240 | protected void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination, Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq) | 238 | protected void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination, Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq) |
241 | { | 239 | { |
242 | m_log.DebugFormat( | 240 | m_log.DebugFormat( |
243 | "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation to {0} in {1}", | 241 | "[ENTITY TRANSFER MODULE]: Request Teleport to {0}:{1}:{2}/{3} final destination {4}", |
244 | position, reg.RegionName); | 242 | reg.ExternalHostName, reg.HttpPort, reg.RegionName, position, finalDestination.RegionName); |
245 | 243 | ||
246 | uint newRegionX = (uint)(reg.RegionHandle >> 40); | 244 | uint newRegionX = (uint)(reg.RegionHandle >> 40); |
247 | uint newRegionY = (((uint)(reg.RegionHandle)) >> 8); | 245 | uint newRegionY = (((uint)(reg.RegionHandle)) >> 8); |
@@ -297,7 +295,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
297 | string reason = String.Empty; | 295 | string reason = String.Empty; |
298 | 296 | ||
299 | // Let's create an agent there if one doesn't exist yet. | 297 | // Let's create an agent there if one doesn't exist yet. |
300 | if (!CreateAgent(reg, finalDestination, agentCircuit, teleportFlags, out reason)) | 298 | if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason)) |
301 | { | 299 | { |
302 | sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}", | 300 | sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}", |
303 | reason)); | 301 | reason)); |
@@ -458,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
458 | } | 456 | } |
459 | 457 | ||
460 | 458 | ||
461 | protected virtual bool CreateAgent(GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason) | 459 | protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason) |
462 | { | 460 | { |
463 | return m_aScene.SimulationService.CreateAgent(finalDestination, agentCircuit, teleportFlags, out reason); | 461 | return m_aScene.SimulationService.CreateAgent(finalDestination, agentCircuit, teleportFlags, out reason); |
464 | } | 462 | } |