diff options
| author | Justin Clark-Casey (justincc) | 2012-04-27 00:58:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-04-27 00:58:54 +0100 |
| commit | 07e62df5582e28675275b3f5143ec37e5697d283 (patch) | |
| tree | 25227c120e0f1ae39d01bfd7dba4b66ef3be0d59 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
| parent | OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar. (diff) | |
| download | opensim-SC_OLD-07e62df5582e28675275b3f5143ec37e5697d283.zip opensim-SC_OLD-07e62df5582e28675275b3f5143ec37e5697d283.tar.gz opensim-SC_OLD-07e62df5582e28675275b3f5143ec37e5697d283.tar.bz2 opensim-SC_OLD-07e62df5582e28675275b3f5143ec37e5697d283.tar.xz | |
Add regression test for teleporting an agent between separated regions on the same simulator.
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 0f3ed27..a318a3c 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -597,7 +597,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 597 | 597 | ||
| 598 | protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout) | 598 | protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout) |
| 599 | { | 599 | { |
| 600 | sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, true); | 600 | if (sp.Scene.AttachmentsModule != null) |
| 601 | sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, true); | ||
| 601 | } | 602 | } |
| 602 | 603 | ||
| 603 | protected void KillEntity(Scene scene, uint localID) | 604 | protected void KillEntity(Scene scene, uint localID) |