aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-27 23:06:28 +0000
committerTeravus Ovares2008-09-27 23:06:28 +0000
commit21bf26e9b472f830c1a78ae0be6fff5e1e77f250 (patch)
treeb49da5334835d5a39bd8f97deb0579a8781fa648 /OpenSim/Region/Environment/Scenes
parent* Replace a generic error handler. (diff)
downloadopensim-SC_OLD-21bf26e9b472f830c1a78ae0be6fff5e1e77f250.zip
opensim-SC_OLD-21bf26e9b472f830c1a78ae0be6fff5e1e77f250.tar.gz
opensim-SC_OLD-21bf26e9b472f830c1a78ae0be6fff5e1e77f250.tar.bz2
opensim-SC_OLD-21bf26e9b472f830c1a78ae0be6fff5e1e77f250.tar.xz
* Adds flag to enable/disable EventQueueGet.
* If EventQueueGet is enabled, use that instead of a few UDP packets, if it's disabled use the UDP packets like normal. * We *really* suggest users do not turn on EventQueueGet yet.. as it's highly experimental, broken, and resource intensive * Updated OpenSim.ini.example * Testers of EventQueueGet.. in OpenSim.ini, it's in the [Startup] Section.. change EventQueue = false, to EventQueue = true.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs16
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index c95068b..a340fe2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -31,9 +31,12 @@ using System.Net;
31using System.Reflection; 31using System.Reflection;
32using System.Threading; 32using System.Threading;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.StructuredData;
34using log4net; 35using log4net;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
38using OpenSim.Region.Interfaces;
39using LLSD = OpenMetaverse.StructuredData.LLSD;
37 40
38namespace OpenSim.Region.Environment.Scenes 41namespace OpenSim.Region.Environment.Scenes
39{ 42{
@@ -283,7 +286,18 @@ namespace OpenSim.Region.Environment.Scenes
283 286
284 if (regionAccepted) 287 if (regionAccepted)
285 { 288 {
286 avatar.ControllingClient.InformClientOfNeighbour(regionHandle, endPoint); 289 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
290 if (eq != null)
291 {
292 LLSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint);
293 eq.Enqueue(Item, avatar.UUID);
294 }
295 else
296 {
297 avatar.ControllingClient.InformClientOfNeighbour(regionHandle, endPoint);
298 // TODO: make Event Queue disablable!
299 }
300
287 avatar.AddNeighbourRegion(regionHandle); 301 avatar.AddNeighbourRegion(regionHandle);
288 m_log.Info("[INTERGRID]: Completed inform client about neighbours"); 302 m_log.Info("[INTERGRID]: Completed inform client about neighbours");
289 } 303 }