diff options
Diffstat (limited to 'OpenSim/Region/Communications/Local/LocalBackEndServices.cs')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 91b6c1f..9d390e4 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -29,6 +29,7 @@ using System.Collections; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Console; | ||
32 | using OpenSim.Framework.Communications; | 33 | using OpenSim.Framework.Communications; |
33 | 34 | ||
34 | namespace OpenSim.Region.Communications.Local | 35 | namespace OpenSim.Region.Communications.Local |
@@ -50,7 +51,6 @@ namespace OpenSim.Region.Communications.Local | |||
50 | set | 51 | set |
51 | { | 52 | { |
52 | _gdebugRegionName = value; | 53 | _gdebugRegionName = value; |
53 | |||
54 | } | 54 | } |
55 | } | 55 | } |
56 | public string _rdebugRegionName = ""; | 56 | public string _rdebugRegionName = ""; |
@@ -61,7 +61,6 @@ namespace OpenSim.Region.Communications.Local | |||
61 | set | 61 | set |
62 | { | 62 | { |
63 | _rdebugRegionName = value; | 63 | _rdebugRegionName = value; |
64 | |||
65 | } | 64 | } |
66 | } | 65 | } |
67 | public LocalBackEndServices() | 66 | public LocalBackEndServices() |
@@ -84,7 +83,7 @@ namespace OpenSim.Region.Communications.Local | |||
84 | RegionCommsListener regionHost = new RegionCommsListener(); | 83 | RegionCommsListener regionHost = new RegionCommsListener(); |
85 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) | 84 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) |
86 | { | 85 | { |
87 | OpenSim.Framework.Console.MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up."); | 86 | MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up."); |
88 | m_regionListeners.Remove(regionInfo.RegionHandle); | 87 | m_regionListeners.Remove(regionInfo.RegionHandle); |
89 | } | 88 | } |
90 | m_regionListeners.Add(regionInfo.RegionHandle, regionHost); | 89 | m_regionListeners.Add(regionInfo.RegionHandle, regionHost); |
@@ -95,7 +94,7 @@ namespace OpenSim.Region.Communications.Local | |||
95 | { | 94 | { |
96 | // Already in our list, so the region went dead and restarted. | 95 | // Already in our list, so the region went dead and restarted. |
97 | m_regions.Remove(regionInfo.RegionHandle); | 96 | m_regions.Remove(regionInfo.RegionHandle); |
98 | OpenSim.Framework.Console.MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up."); | 97 | MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up."); |
99 | 98 | ||
100 | RegionCommsListener regionHost = new RegionCommsListener(); | 99 | RegionCommsListener regionHost = new RegionCommsListener(); |
101 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) | 100 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) |
@@ -208,7 +207,6 @@ namespace OpenSim.Region.Communications.Local | |||
208 | 207 | ||
209 | public bool TriggerRegionUp(RegionInfo region, ulong regionhandle) | 208 | public bool TriggerRegionUp(RegionInfo region, ulong regionhandle) |
210 | { | 209 | { |
211 | |||
212 | if (m_regionListeners.ContainsKey(regionhandle)) | 210 | if (m_regionListeners.ContainsKey(regionhandle)) |
213 | { | 211 | { |
214 | return m_regionListeners[regionhandle].TriggerRegionUp(region); | 212 | return m_regionListeners[regionhandle].TriggerRegionUp(region); |
@@ -227,13 +225,13 @@ namespace OpenSim.Region.Communications.Local | |||
227 | //should change from agentCircuitData | 225 | //should change from agentCircuitData |
228 | { | 226 | { |
229 | //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); | 227 | //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); |
230 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); | 228 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); |
231 | 229 | ||
232 | if (m_regionListeners.ContainsKey(regionHandle)) | 230 | if (m_regionListeners.ContainsKey(regionHandle)) |
233 | { | 231 | { |
234 | // Console.WriteLine("CommsManager- Informing a region to expect child agent"); | 232 | // Console.WriteLine("CommsManager- Informing a region to expect child agent"); |
235 | m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData); | 233 | m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData); |
236 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); | 234 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); |
237 | 235 | ||
238 | return true; | 236 | return true; |
239 | } | 237 | } |
@@ -327,11 +325,11 @@ namespace OpenSim.Region.Communications.Local | |||
327 | 325 | ||
328 | public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) | 326 | public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) |
329 | { | 327 | { |
330 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname); | 328 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname); |
331 | 329 | ||
332 | if (m_regionListeners.ContainsKey(regionHandle)) | 330 | if (m_regionListeners.ContainsKey(regionHandle)) |
333 | { | 331 | { |
334 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname); | 332 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname); |
335 | 333 | ||
336 | m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent); | 334 | m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent); |
337 | } | 335 | } |
@@ -343,7 +341,6 @@ namespace OpenSim.Region.Communications.Local | |||
343 | { | 341 | { |
344 | m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); | 342 | m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); |
345 | } | 343 | } |
346 | |||
347 | } | 344 | } |
348 | 345 | ||
349 | public void PingCheckReply(Hashtable respData) | 346 | public void PingCheckReply(Hashtable respData) |
@@ -381,11 +378,11 @@ namespace OpenSim.Region.Communications.Local | |||
381 | 378 | ||
382 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) | 379 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) |
383 | { | 380 | { |
384 | // OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); | 381 | // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); |
385 | 382 | ||
386 | if (m_regionListeners.ContainsKey(regionHandle)) | 383 | if (m_regionListeners.ContainsKey(regionHandle)) |
387 | { | 384 | { |
388 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname); | 385 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname); |
389 | 386 | ||
390 | TriggerExpectUser(regionHandle, agentData); | 387 | TriggerExpectUser(regionHandle, agentData); |
391 | return true; | 388 | return true; |
@@ -394,4 +391,4 @@ namespace OpenSim.Region.Communications.Local | |||
394 | return false; | 391 | return false; |
395 | } | 392 | } |
396 | } | 393 | } |
397 | } \ No newline at end of file | 394 | } |