aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ThirdParty/3Di/LoadBalancer
diff options
context:
space:
mode:
authorlbsa712008-03-14 15:28:34 +0000
committerlbsa712008-03-14 15:28:34 +0000
commit24aedf52c6b903720f588694880e9613b115cc0c (patch)
tree7b49f8104251eff2c5e961b0134ab3c5c655cd56 /ThirdParty/3Di/LoadBalancer
parentAttempt to fix mantis #741, could not replicate it myself. But the error was... (diff)
downloadopensim-SC_OLD-24aedf52c6b903720f588694880e9613b115cc0c.zip
opensim-SC_OLD-24aedf52c6b903720f588694880e9613b115cc0c.tar.gz
opensim-SC_OLD-24aedf52c6b903720f588694880e9613b115cc0c.tar.bz2
opensim-SC_OLD-24aedf52c6b903720f588694880e9613b115cc0c.tar.xz
* Added null root part guard
* Normalized some UUID handling * Compacted a few Contains/Add into Set
Diffstat (limited to 'ThirdParty/3Di/LoadBalancer')
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 27fa148..325385a 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -438,9 +438,9 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
438 string filename; 438 string filename;
439 IClientAPI controller = null; 439 IClientAPI controller = null;
440 440
441 m_log.InfoFormat("[BALANCER] "+"agent id : {0}", pre.m_uuid); 441 m_log.InfoFormat("[BALANCER] "+"agent id : {0}", pre.UUID);
442 442
443 uint[] circuits = scene.ClientManager.GetAllCircuits(pre.m_uuid); 443 uint[] circuits = scene.ClientManager.GetAllCircuits(pre.UUID);
444 444
445 foreach (uint code in circuits) 445 foreach (uint code in circuits)
446 { 446 {
@@ -535,12 +535,12 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
535 } 535 }
536 536
537 sp = (ScenePresence)Util.DeserializeFromFile(filename); 537 sp = (ScenePresence)Util.DeserializeFromFile(filename);
538 Console.WriteLine("agent id = {0}", sp.m_uuid); 538 Console.WriteLine("agent id = {0}", sp.UUID);
539 539
540 scene.m_restorePresences.Add(sp.m_uuid, sp); 540 scene.m_restorePresences.Add(sp.UUID, sp);
541 File.Delete(filename); 541 File.Delete(filename);
542 542
543 m_log.InfoFormat("[BALANCER] " + "scene presence deserialized [{0}]", sp.m_uuid); 543 m_log.InfoFormat("[BALANCER] " + "scene presence deserialized [{0}]", sp.UUID);
544 544
545 // restore the ClientView 545 // restore the ClientView
546 546
@@ -645,7 +645,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
645 // remove all scene presences 645 // remove all scene presences
646 foreach (ScenePresence pre in presences) 646 foreach (ScenePresence pre in presences)
647 { 647 {
648 uint[] circuits = scene.ClientManager.GetAllCircuits(pre.m_uuid); 648 uint[] circuits = scene.ClientManager.GetAllCircuits(pre.UUID);
649 649
650 foreach (uint code in circuits) 650 foreach (uint code in circuits)
651 { 651 {
@@ -666,7 +666,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
666 } 666 }
667 667
668 // remove scene presence 668 // remove scene presence
669 scene.RemoveClient(pre.m_uuid); 669 scene.RemoveClient(pre.UUID);
670 } 670 }
671 } 671 }
672 672