diff options
author | Melanie | 2013-05-07 00:31:11 +0100 |
---|---|---|
committer | Melanie | 2013-05-07 00:31:11 +0100 |
commit | 4c83b5e719ad288b1250fbed3f74698fa34eff21 (patch) | |
tree | 31eb880c4cf00b0697b07fd7f392ad374a11d1db /OpenSim/Region/Framework | |
parent | BulletSim: apply linear and angular friction in vehicle coordinates (diff) | |
download | opensim-SC-4c83b5e719ad288b1250fbed3f74698fa34eff21.zip opensim-SC-4c83b5e719ad288b1250fbed3f74698fa34eff21.tar.gz opensim-SC-4c83b5e719ad288b1250fbed3f74698fa34eff21.tar.bz2 opensim-SC-4c83b5e719ad288b1250fbed3f74698fa34eff21.tar.xz |
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/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs index 69be83e..1c43a25 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
72 | /// </summary> | 72 | /// </summary> |
73 | /// <param name='id'></param> | 73 | /// <param name='id'></param> |
74 | /// <param name='client'></param> | 74 | /// <param name='client'></param> |
75 | void TeleportHome(UUID id, IClientAPI client); | 75 | bool TeleportHome(UUID id, IClientAPI client); |
76 | 76 | ||
77 | /// <summary> | 77 | /// <summary> |
78 | /// Show whether the given agent is being teleported. | 78 | /// Show whether the given agent is being teleported. |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8fe2d72..2aba2dd 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3230,17 +3230,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
3230 | /// </summary> | 3230 | /// </summary> |
3231 | /// <param name="agentId">The avatar's Unique ID</param> | 3231 | /// <param name="agentId">The avatar's Unique ID</param> |
3232 | /// <param name="client">The IClientAPI for the client</param> | 3232 | /// <param name="client">The IClientAPI for the client</param> |
3233 | public virtual void TeleportClientHome(UUID agentId, IClientAPI client) | 3233 | public virtual bool TeleportClientHome(UUID agentId, IClientAPI client) |
3234 | { | 3234 | { |
3235 | if (EntityTransferModule != null) | 3235 | if (EntityTransferModule != null) |
3236 | { | 3236 | { |
3237 | EntityTransferModule.TeleportHome(agentId, client); | 3237 | return EntityTransferModule.TeleportHome(agentId, client); |
3238 | } | 3238 | } |
3239 | else | 3239 | else |
3240 | { | 3240 | { |
3241 | m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); | 3241 | m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); |
3242 | client.SendTeleportFailed("Unable to perform teleports on this simulator."); | 3242 | client.SendTeleportFailed("Unable to perform teleports on this simulator."); |
3243 | } | 3243 | } |
3244 | return false; | ||
3244 | } | 3245 | } |
3245 | 3246 | ||
3246 | /// <summary> | 3247 | /// <summary> |