aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorAdam Frisby2009-08-21 13:44:20 +1000
committerAdam Frisby2009-08-21 13:44:20 +1000
commit25dbf16cfb1d4c74792eae170bc766d3eb522a24 (patch)
treee811a6f8b496329271b1386bd5268972bf2aa7af /OpenSim/Region/Framework
parent* Attempting to diagnose a connection bug. (diff)
downloadopensim-SC_OLD-25dbf16cfb1d4c74792eae170bc766d3eb522a24.zip
opensim-SC_OLD-25dbf16cfb1d4c74792eae170bc766d3eb522a24.tar.gz
opensim-SC_OLD-25dbf16cfb1d4c74792eae170bc766d3eb522a24.tar.bz2
opensim-SC_OLD-25dbf16cfb1d4c74792eae170bc766d3eb522a24.tar.xz
* Once more into the breach!
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b50d0cb..6118a70 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2044,11 +2044,14 @@ namespace OpenSim.Region.Framework.Scenes
2044 { 2044 {
2045 AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); 2045 AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode);
2046 2046
2047 m_log.Debug("[Scene] Adding new agent " + client.Name + " to scene " + RegionInfo.RegionName);
2048 /*
2047 string logMsg = string.Format("[SCENE]: Adding new {0} agent for {1} in {2}", 2049 string logMsg = string.Format("[SCENE]: Adding new {0} agent for {1} in {2}",
2048 ((aCircuit.child == true) ? "child" : "root"), client.Name, 2050 ((aCircuit.child == true) ? "child" : "root"), client.Name,
2049 RegionInfo.RegionName); 2051 RegionInfo.RegionName);
2050 2052
2051 m_log.Debug(logMsg); 2053 m_log.Debug(logMsg);
2054 */
2052 2055
2053 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); 2056 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
2054 2057
@@ -2057,7 +2060,7 @@ namespace OpenSim.Region.Framework.Scenes
2057 // HERE!!! Do the initial attachments right here 2060 // HERE!!! Do the initial attachments right here
2058 // first agent upon login is a root agent by design. 2061 // first agent upon login is a root agent by design.
2059 // All other AddNewClient calls find aCircuit.child to be true 2062 // All other AddNewClient calls find aCircuit.child to be true
2060 if (aCircuit.child == false) 2063 if (aCircuit == null || aCircuit.child == false)
2061 { 2064 {
2062 sp.IsChildAgent = false; 2065 sp.IsChildAgent = false;
2063 sp.RezAttachments(); 2066 sp.RezAttachments();