aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-26 11:48:05 -0400
committerTeravus Ovares (Dan Olivares)2009-08-26 11:48:05 -0400
commit54e05a083d2aeb7a892647f64edfd52db80ce5ed (patch)
tree1fca51f8dd19c0f4871d8e1b875511c6087b3675 /OpenSim/Region/Framework/Scenes/Scene.cs
parent* It turns out that Physics heightmap values were being stored in managed mem... (diff)
parentAdd reference to OpenMetaverse.dll to UserServer.Modules to make MSVS happy (diff)
downloadopensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.zip
opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.gz
opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.bz2
opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs13
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index cb4e443..acf0375 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2143,9 +2143,14 @@ namespace OpenSim.Region.Framework.Scenes
2143 { 2143 {
2144 AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); 2144 AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode);
2145 2145
2146 m_log.DebugFormat( 2146 m_log.Debug("[Scene] Adding new agent " + client.Name + " to scene " + RegionInfo.RegionName);
2147 "[SCENE]: Adding new {0} agent for {1} in {2}", 2147 /*
2148 ((aCircuit.child == true) ? "child" : "root"), client.Name, RegionInfo.RegionName); 2148 string logMsg = string.Format("[SCENE]: Adding new {0} agent for {1} in {2}",
2149 ((aCircuit.child == true) ? "child" : "root"), client.Name,
2150 RegionInfo.RegionName);
2151
2152 m_log.Debug(logMsg);
2153 */
2149 2154
2150 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); 2155 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
2151 2156
@@ -2154,7 +2159,7 @@ namespace OpenSim.Region.Framework.Scenes
2154 // HERE!!! Do the initial attachments right here 2159 // HERE!!! Do the initial attachments right here
2155 // first agent upon login is a root agent by design. 2160 // first agent upon login is a root agent by design.
2156 // All other AddNewClient calls find aCircuit.child to be true 2161 // All other AddNewClient calls find aCircuit.child to be true
2157 if (aCircuit.child == false) 2162 if (aCircuit == null || aCircuit.child == false)
2158 { 2163 {
2159 sp.IsChildAgent = false; 2164 sp.IsChildAgent = false;
2160 sp.RezAttachments(); 2165 sp.RezAttachments();