From b80a48841eb00d98105fa8cd84e90a4df407d237 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Wed, 3 Dec 2008 03:26:58 +0000 Subject: Remove the bandaid (fast rip) --- .../Scenes/Hypergrid/HGSceneCommunicationService.cs | 20 ++++++++++---------- .../Environment/Scenes/SceneCommunicationService.cs | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs index 6737a1b..7505c75 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs @@ -170,16 +170,16 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid agent.child = false; m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); - //if (eq != null) - //{ - // OSD Item = EventQueueHelper.EnableSimulator(realHandle, reg.ExternalEndPoint); - // eq.Enqueue(Item, avatar.UUID); - //} - //else - //{ - // avatar.ControllingClient.InformClientOfNeighbour(realHandle, reg.ExternalEndPoint); - // // TODO: make Event Queue disablable! - //} + if (eq != null) + { + OSD Item = EventQueueHelper.EnableSimulator(realHandle, reg.ExternalEndPoint); + eq.Enqueue(Item, avatar.UUID); + } + else + { + avatar.ControllingClient.InformClientOfNeighbour(realHandle, reg.ExternalEndPoint); + // TODO: make Event Queue disablable! + } m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, position, false); diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 6e43865..c36c5ba 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -683,15 +683,15 @@ namespace OpenSim.Region.Environment.Scenes agent.child = false; m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); - //if (eq != null) - //{ - // OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, reg.ExternalEndPoint); - // eq.Enqueue(Item, avatar.UUID); - //} - //else - //{ - // avatar.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, reg.ExternalEndPoint); - //} + if (eq != null) + { + OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, reg.ExternalEndPoint); + eq.Enqueue(Item, avatar.UUID); + } + else + { + avatar.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, reg.ExternalEndPoint); + } m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, position, false); -- cgit v1.1