diff options
Step one of estate settings sharing - port the Avination Estate module (complete module) as changes are too extensive to apply manually
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index ca0cef1..eac0da7 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
243 | 243 | ||
244 | protected virtual void OnNewClient(IClientAPI client) | 244 | protected virtual void OnNewClient(IClientAPI client) |
245 | { | 245 | { |
246 | client.OnTeleportHomeRequest += TeleportHome; | 246 | client.OnTeleportHomeRequest += TriggerTeleportHome; |
247 | client.OnTeleportLandmarkRequest += RequestTeleportLandmark; | 247 | client.OnTeleportLandmarkRequest += RequestTeleportLandmark; |
248 | 248 | ||
249 | if (!DisableInterRegionTeleportCancellation) | 249 | if (!DisableInterRegionTeleportCancellation) |
@@ -1071,7 +1071,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1071 | 1071 | ||
1072 | #region Teleport Home | 1072 | #region Teleport Home |
1073 | 1073 | ||
1074 | public virtual void TeleportHome(UUID id, IClientAPI client) | 1074 | public virtual void TriggerTeleportHome(UUID id, IClientAPI client) |
1075 | { | ||
1076 | TeleportHome(id, client); | ||
1077 | } | ||
1078 | |||
1079 | public virtual bool TeleportHome(UUID id, IClientAPI client) | ||
1075 | { | 1080 | { |
1076 | m_log.DebugFormat( | 1081 | m_log.DebugFormat( |
1077 | "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId); | 1082 | "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId); |
@@ -1086,7 +1091,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1086 | { | 1091 | { |
1087 | // can't find the Home region: Tell viewer and abort | 1092 | // can't find the Home region: Tell viewer and abort |
1088 | client.SendTeleportFailed("Your home region could not be found."); | 1093 | client.SendTeleportFailed("Your home region could not be found."); |
1089 | return; | 1094 | return false; |
1090 | } | 1095 | } |
1091 | 1096 | ||
1092 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})", | 1097 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})", |
@@ -1096,6 +1101,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1096 | ((Scene)(client.Scene)).RequestTeleportLocation( | 1101 | ((Scene)(client.Scene)).RequestTeleportLocation( |
1097 | client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt, | 1102 | client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt, |
1098 | (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); | 1103 | (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); |
1104 | return true; | ||
1099 | } | 1105 | } |
1100 | else | 1106 | else |
1101 | { | 1107 | { |
@@ -1103,6 +1109,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1103 | "[ENTITY TRANSFER MODULE]: No grid user information found for {0} {1}. Cannot send home.", | 1109 | "[ENTITY TRANSFER MODULE]: No grid user information found for {0} {1}. Cannot send home.", |
1104 | client.Name, client.AgentId); | 1110 | client.Name, client.AgentId); |
1105 | } | 1111 | } |
1112 | return false; | ||
1106 | } | 1113 | } |
1107 | 1114 | ||
1108 | #endregion | 1115 | #endregion |