aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authoronefang2019-08-03 20:04:12 +1000
committeronefang2019-08-03 20:04:12 +1000
commit5273ce5ee391a433b491804ee28e775ab6d0c4be (patch)
tree4211d0d50ab8e0d1f641894988fe2be8c483d57e /OpenSim/Region/Framework/Scenes
parentAnother attempt at sorting out the auto group chicken and egg problems. (diff)
downloadopensim-SC-5273ce5ee391a433b491804ee28e775ab6d0c4be.zip
opensim-SC-5273ce5ee391a433b491804ee28e775ab6d0c4be.tar.gz
opensim-SC-5273ce5ee391a433b491804ee28e775ab6d0c4be.tar.bz2
opensim-SC-5273ce5ee391a433b491804ee28e775ab6d0c4be.tar.xz
Hypergridders have their full name in firstname, and their grid in lastname. Sometimes.
Code filled with gotos may be spaghetti code, but object oriented code can be like chopped spaghetti. At least with gotos you can follow them.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs15
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fcfa448..b255924 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4411,17 +4411,30 @@ namespace OpenSim.Region.Framework.Scenes
4411 if (isLocal) 4411 if (isLocal)
4412 { 4412 {
4413 grid = "local"; 4413 grid = "local";
4414 m_log.InfoFormat("[CONNECTION BEGIN]: LOCAL agent {0}, checking auto groups.", agent.AgentID); 4414 m_log.InfoFormat("[CONNECTION BEGIN]: LOCAL agent {0} {1} {2} {3}, checking auto groups.", agent.firstname, agent.lastname, agent.Name, agent.AgentID);
4415 } 4415 }
4416 else 4416 else
4417 { 4417 {
4418 // agent.AgentID could look like this - @grid.com:8002 01234567-89ab-cdef-0123-456789abcdef 4418 // agent.AgentID could look like this - @grid.com:8002 01234567-89ab-cdef-0123-456789abcdef
4419 // Or agent.lastname could.
4419 string a = agent.AgentID.ToString(); 4420 string a = agent.AgentID.ToString();
4420 if ("@" == a.Substring(0, 1)) 4421 if ("@" == a.Substring(0, 1))
4421 { 4422 {
4422 grid = a.Split(':')[0].Substring(1); 4423 grid = a.Split(':')[0].Substring(1);
4423 m_log.InfoFormat("[CONNECTION BEGIN]: HYPERGRID agent {0} from grid {1}, checking auto groups.", agent.AgentID, grid); 4424 m_log.InfoFormat("[CONNECTION BEGIN]: HYPERGRID agent {0} from grid {1}, checking auto groups.", agent.AgentID, grid);
4424 } 4425 }
4426 else
4427 {
4428 a = agent.lastname;
4429 if (String.Empty != a)
4430 {
4431 if ("@" == a.Substring(0, 1))
4432 {
4433 grid = a.Split(':')[0].Substring(1);
4434 m_log.InfoFormat("[CONNECTION BEGIN]: HYPERGRID agent {0} from grid {1}, checking auto groups.", agent.firstname, grid);
4435 }
4436 }
4437 }
4425 } 4438 }
4426 string[] groupIDs = null; 4439 string[] groupIDs = null;
4427 try 4440 try