diff options
author | Oren Hurvitz | 2014-04-03 12:47:20 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-03 14:13:03 +0100 |
commit | 6d2893be67fd725090b69f5f31c0985c3d211135 (patch) | |
tree | 6dd6ff48ed74f751730930635638b3a54fce4b7f /OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |
parent | BulletSim: make avatar physical shape to be a rectangle rather than (diff) | |
download | opensim-SC_OLD-6d2893be67fd725090b69f5f31c0985c3d211135.zip opensim-SC_OLD-6d2893be67fd725090b69f5f31c0985c3d211135.tar.gz opensim-SC_OLD-6d2893be67fd725090b69f5f31c0985c3d211135.tar.bz2 opensim-SC_OLD-6d2893be67fd725090b69f5f31c0985c3d211135.tar.xz |
When teleporting using Hypergrid, show more informative error messages in case of error
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index a34f2d2..317f0e9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
@@ -239,16 +239,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
239 | GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); | 239 | GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); |
240 | GridRegion gatekeeper = new GridRegion(); | 240 | GridRegion gatekeeper = new GridRegion(); |
241 | gatekeeper.ServerURI = url; | 241 | gatekeeper.ServerURI = url; |
242 | GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID)); | 242 | string message; |
243 | GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID), out message); | ||
243 | if (finalDestination != null) | 244 | if (finalDestination != null) |
244 | { | 245 | { |
245 | ScenePresence sp = scene.GetScenePresence(client.AgentId); | 246 | ScenePresence sp = scene.GetScenePresence(client.AgentId); |
246 | IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>(); | 247 | IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>(); |
247 | 248 | ||
248 | if (transferMod != null && sp != null) | 249 | if (transferMod != null && sp != null) |
250 | { | ||
251 | if (message != null) | ||
252 | sp.ControllingClient.SendAgentAlertMessage(message, true); | ||
253 | |||
249 | transferMod.DoTeleport( | 254 | transferMod.DoTeleport( |
250 | sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f), | 255 | sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f), |
251 | Vector3.UnitX, teleportflags); | 256 | Vector3.UnitX, teleportflags); |
257 | } | ||
258 | } | ||
259 | else | ||
260 | { | ||
261 | m_log.InfoFormat("[HG LURE MODULE]: Lure failed: {0}", message); | ||
262 | client.SendAgentAlertMessage(message, true); | ||
252 | } | 263 | } |
253 | } | 264 | } |
254 | } | 265 | } |