aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-02-19 16:42:01 -0800
committerDiva Canto2012-02-19 16:42:01 -0800
commit1c3ee5d1cedbd3952ef523778f61c3f7d8e67332 (patch)
tree2b6aa3d8c5d75d17add232c2878b0f9f6699395e /OpenSim
parentAmend to last commit. This should have been committed too. (diff)
downloadopensim-SC-1c3ee5d1cedbd3952ef523778f61c3f7d8e67332.zip
opensim-SC-1c3ee5d1cedbd3952ef523778f61c3f7d8e67332.tar.gz
opensim-SC-1c3ee5d1cedbd3952ef523778f61c3f7d8e67332.tar.bz2
opensim-SC-1c3ee5d1cedbd3952ef523778f61c3f7d8e67332.tar.xz
One more tweak related to the previous 2 commits.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 6e4c0b1..8f047ea 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -994,6 +994,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
994 neighbourRegion.RegionHandle); 994 neighbourRegion.RegionHandle);
995 return agent; 995 return agent;
996 } 996 }
997 // No turning back
998 agent.IsChildAgent = true;
999
997 string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps); 1000 string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
998 1001
999 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); 1002 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
@@ -1138,7 +1141,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1138 1141
1139 /// <summary> 1142 /// <summary>
1140 /// This informs all neighbouring regions about agent "avatar". 1143 /// This informs all neighbouring regions about agent "avatar".
1141 /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
1142 /// </summary> 1144 /// </summary>
1143 /// <param name="sp"></param> 1145 /// <param name="sp"></param>
1144 public void EnableChildAgents(ScenePresence sp) 1146 public void EnableChildAgents(ScenePresence sp)