diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index a340fe2..3f3a68d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
| @@ -687,8 +687,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 687 | m_log.DebugFormat( | 687 | m_log.DebugFormat( |
| 688 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); | 688 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); |
| 689 | 689 | ||
| 690 | avatar.ControllingClient.SendRegionTeleport(reg.RegionHandle, 13, reg.ExternalEndPoint, 4, teleportFlags, | 690 | IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); |
| 691 | capsPath); | 691 | if (eq != null) |
| 692 | { | ||
| 693 | LLSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint, | ||
| 694 | 4, teleportFlags, capsPath, avatar.UUID); | ||
| 695 | eq.Enqueue(Item, avatar.UUID); | ||
| 696 | } | ||
| 697 | else | ||
| 698 | { | ||
| 699 | avatar.ControllingClient.SendRegionTeleport(reg.RegionHandle, 13, reg.ExternalEndPoint, 4, | ||
| 700 | teleportFlags, capsPath); | ||
| 701 | } | ||
| 702 | |||
| 692 | avatar.MakeChildAgent(); | 703 | avatar.MakeChildAgent(); |
| 693 | Thread.Sleep(5000); | 704 | Thread.Sleep(5000); |
| 694 | avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle); | 705 | avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle); |