aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-03 03:26:58 +0000
committerMelanie Thielker2008-12-03 03:26:58 +0000
commitb80a48841eb00d98105fa8cd84e90a4df407d237 (patch)
tree51546cc8c2b6651fcdeec740acdc443d03060dd8 /OpenSim/Region/Environment/Scenes
parentApply Diva's bandaid to OpenSim's scraped knee. (diff)
downloadopensim-SC_OLD-b80a48841eb00d98105fa8cd84e90a4df407d237.zip
opensim-SC_OLD-b80a48841eb00d98105fa8cd84e90a4df407d237.tar.gz
opensim-SC_OLD-b80a48841eb00d98105fa8cd84e90a4df407d237.tar.bz2
opensim-SC_OLD-b80a48841eb00d98105fa8cd84e90a4df407d237.tar.xz
Remove the bandaid (fast rip)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs20
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs18
2 files changed, 19 insertions, 19 deletions
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
170 agent.child = false; 170 agent.child = false;
171 m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); 171 m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent);
172 172
173 //if (eq != null) 173 if (eq != null)
174 //{ 174 {
175 // OSD Item = EventQueueHelper.EnableSimulator(realHandle, reg.ExternalEndPoint); 175 OSD Item = EventQueueHelper.EnableSimulator(realHandle, reg.ExternalEndPoint);
176 // eq.Enqueue(Item, avatar.UUID); 176 eq.Enqueue(Item, avatar.UUID);
177 //} 177 }
178 //else 178 else
179 //{ 179 {
180 // avatar.ControllingClient.InformClientOfNeighbour(realHandle, reg.ExternalEndPoint); 180 avatar.ControllingClient.InformClientOfNeighbour(realHandle, reg.ExternalEndPoint);
181 // // TODO: make Event Queue disablable! 181 // TODO: make Event Queue disablable!
182 //} 182 }
183 183
184 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, 184 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
185 position, false); 185 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
683 agent.child = false; 683 agent.child = false;
684 m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); 684 m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent);
685 685
686 //if (eq != null) 686 if (eq != null)
687 //{ 687 {
688 // OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, reg.ExternalEndPoint); 688 OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, reg.ExternalEndPoint);
689 // eq.Enqueue(Item, avatar.UUID); 689 eq.Enqueue(Item, avatar.UUID);
690 //} 690 }
691 //else 691 else
692 //{ 692 {
693 // avatar.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, reg.ExternalEndPoint); 693 avatar.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, reg.ExternalEndPoint);
694 //} 694 }
695 695
696 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, 696 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
697 position, false); 697 position, false);