Merge branch 'master' into careminster-presence-refactor

1 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1575e50..253adae 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2706,8 +2706,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 string homeURL = string.Empty;
                 string first = aCircuit.firstname, last = aCircuit.lastname;
+
                 if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
                     homeURL = aCircuit.ServiceURLs["HomeURI"].ToString();
+
                 if (aCircuit.lastname.StartsWith("@"))
                 {
                     string[] parts = aCircuit.firstname.Split('.');
@@ -2717,6 +2719,7 @@ namespace OpenSim.Region.Framework.Scenes
                         last = parts[1];
                     }
                 }
+
                 uMan.AddUser(aCircuit.AgentID, first, last, homeURL);
             }
         }
@@ -3530,7 +3533,6 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-
             // In all cases, add or update the circuit data with the new agent circuit data and teleport flags
             agent.teleportFlags = teleportFlags;
             m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);