* Once more into the breach!

arthursv
Adam Frisby 2009-08-21 13:44:20 +10:00
parent d4600eec4d
commit 25dbf16cfb
1 changed files with 4 additions and 1 deletions

View File

@ -2044,11 +2044,14 @@ namespace OpenSim.Region.Framework.Scenes
{ {
AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode);
m_log.Debug("[Scene] Adding new agent " + client.Name + " to scene " + RegionInfo.RegionName);
/*
string logMsg = string.Format("[SCENE]: Adding new {0} agent for {1} in {2}", string logMsg = string.Format("[SCENE]: Adding new {0} agent for {1} in {2}",
((aCircuit.child == true) ? "child" : "root"), client.Name, ((aCircuit.child == true) ? "child" : "root"), client.Name,
RegionInfo.RegionName); RegionInfo.RegionName);
m_log.Debug(logMsg); m_log.Debug(logMsg);
*/
CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
@ -2057,7 +2060,7 @@ namespace OpenSim.Region.Framework.Scenes
// HERE!!! Do the initial attachments right here // HERE!!! Do the initial attachments right here
// first agent upon login is a root agent by design. // first agent upon login is a root agent by design.
// All other AddNewClient calls find aCircuit.child to be true // All other AddNewClient calls find aCircuit.child to be true
if (aCircuit.child == false) if (aCircuit == null || aCircuit.child == false)
{ {
sp.IsChildAgent = false; sp.IsChildAgent = false;
sp.RezAttachments(); sp.RezAttachments();