diff options
| author | Melanie | 2012-05-02 01:37:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-02 01:37:51 +0100 |
| commit | bf630fb808420c15abc100f11b993b9e6e1113c2 (patch) | |
| tree | 11a10a97e78725e96807c01a656123f934acb04a /OpenSim/Region/CoreModules/Avatar/Lure | |
| parent | Merge branch 'avination' (diff) | |
| parent | Comment out the five second sleep in etm.DoTeleport() if the old agent needs ... (diff) | |
| download | opensim-SC_OLD-bf630fb808420c15abc100f11b993b9e6e1113c2.zip opensim-SC_OLD-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.gz opensim-SC_OLD-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.bz2 opensim-SC_OLD-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index bc5c1ff..92cf9d1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
| @@ -240,13 +240,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
| 240 | { | 240 | { |
| 241 | ScenePresence sp = scene.GetScenePresence(client.AgentId); | 241 | ScenePresence sp = scene.GetScenePresence(client.AgentId); |
| 242 | IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>(); | 242 | IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>(); |
| 243 | IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>(); | 243 | |
| 244 | if (transferMod != null && sp != null && eq != null) | 244 | if (transferMod != null && sp != null) |
| 245 | transferMod.DoTeleport(sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f), Vector3.UnitX, teleportflags, eq); | 245 | transferMod.DoTeleport( |
| 246 | sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f), | ||
| 247 | Vector3.UnitX, teleportflags); | ||
| 246 | } | 248 | } |
| 247 | } | 249 | } |
| 248 | } | 250 | } |
| 249 | } | 251 | } |
| 250 | } | 252 | } |
| 251 | } | 253 | } |
| 252 | } | 254 | } \ No newline at end of file |