diff options
author | Justin Clark-Casey (justincc) | 2011-08-09 23:11:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-09 23:11:07 +0100 |
commit | 92e96d394a1712ed16b0a7835dd2ccfde01f3fee (patch) | |
tree | 434727add1ec2fb9806297027bba5a3dbcede4c3 /OpenSim/Region/Framework | |
parent | Add osOwnerSaveAppearance() to help with setting up NPC appearances. Not yet... (diff) | |
download | opensim-SC-92e96d394a1712ed16b0a7835dd2ccfde01f3fee.zip opensim-SC-92e96d394a1712ed16b0a7835dd2ccfde01f3fee.tar.gz opensim-SC-92e96d394a1712ed16b0a7835dd2ccfde01f3fee.tar.bz2 opensim-SC-92e96d394a1712ed16b0a7835dd2ccfde01f3fee.tar.xz |
When an NPC is created, stop telling neighbouring regions to expect a child agent
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cd5228d..af28dd9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1144,10 +1144,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1144 | 1144 | ||
1145 | /// <summary> | 1145 | /// <summary> |
1146 | /// Complete Avatar's movement into the region. | 1146 | /// Complete Avatar's movement into the region. |
1147 | /// This is called upon a very important packet sent from the client, | ||
1148 | /// so it's client-controlled. Never call this method directly. | ||
1149 | /// </summary> | 1147 | /// </summary> |
1150 | public void CompleteMovement(IClientAPI client) | 1148 | /// <param name="client"></param> |
1149 | /// <param name="enableNeighbourChildAgents"> | ||
1150 | /// If true, send notification to neighbour regions to expect | ||
1151 | /// a child agent from the client. These neighbours can be some distance away, depending right now on the | ||
1152 | /// configuration of DefaultDrawDistance in the [Startup] section of config | ||
1153 | /// </param> | ||
1154 | public void CompleteMovement(IClientAPI client, bool enableNeighbourChildAgents) | ||
1151 | { | 1155 | { |
1152 | // DateTime startTime = DateTime.Now; | 1156 | // DateTime startTime = DateTime.Now; |
1153 | 1157 | ||
@@ -1188,7 +1192,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1188 | SendInitialData(); | 1192 | SendInitialData(); |
1189 | 1193 | ||
1190 | // Create child agents in neighbouring regions | 1194 | // Create child agents in neighbouring regions |
1191 | if (!m_isChildAgent) | 1195 | if (enableNeighbourChildAgents && !m_isChildAgent) |
1192 | { | 1196 | { |
1193 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); | 1197 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); |
1194 | if (m_agentTransfer != null) | 1198 | if (m_agentTransfer != null) |