aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-03 01:55:40 +0000
committerMelanie Thielker2008-12-03 01:55:40 +0000
commit0edb533c27e294b5e5d7c6fd05c14f2121f0ce3c (patch)
treea72f847f2b871f8dd281c44db45e12c7dd8cac27
parent* Apply http://opensimulator.org/mantis/view.php?id=2741 (diff)
downloadopensim-SC_OLD-0edb533c27e294b5e5d7c6fd05c14f2121f0ce3c.zip
opensim-SC_OLD-0edb533c27e294b5e5d7c6fd05c14f2121f0ce3c.tar.gz
opensim-SC_OLD-0edb533c27e294b5e5d7c6fd05c14f2121f0ce3c.tar.bz2
opensim-SC_OLD-0edb533c27e294b5e5d7c6fd05c14f2121f0ce3c.tar.xz
Apply Diva's bandaid to OpenSim's scraped knee.
-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 7505c75..6737a1b 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 c36c5ba..6e43865 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);