diff options
author | Justin Clark-Casey (justincc) | 2014-08-15 21:46:28 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-08-15 21:47:34 +0100 |
commit | e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b (patch) | |
tree | 6826fc7df72508e3cc02a1d3795ab4065de65cf0 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | On teleport to a region that already has a child agent established (e.g. a ne... (diff) | |
download | opensim-SC_OLD-e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b.zip opensim-SC_OLD-e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b.tar.gz opensim-SC_OLD-e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b.tar.bz2 opensim-SC_OLD-e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b.tar.xz |
If a user moves back in sight of a child region before the agent has been closed on teleport, don't unnecessarily resend all avatar and object data about that region.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 272fa16..ebbc6f3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -286,9 +286,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
286 | } | 286 | } |
287 | } | 287 | } |
288 | 288 | ||
289 | /// <summary> | ||
290 | /// Set if initial data about the scene (avatars, objects) has been sent to the ControllingClient. | ||
291 | /// </summary> | ||
292 | public bool SentInitialDataToClient { get; private set; } | 289 | public bool SentInitialDataToClient { get; private set; } |
293 | 290 | ||
294 | /// <summary> | 291 | /// <summary> |
@@ -3351,9 +3348,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3351 | // Send all scene object to the new client | 3348 | // Send all scene object to the new client |
3352 | Util.RunThreadNoTimeout(delegate | 3349 | Util.RunThreadNoTimeout(delegate |
3353 | { | 3350 | { |
3354 | m_log.DebugFormat( | 3351 | // m_log.DebugFormat( |
3355 | "[SCENE PRESENCE]: Sending initial data to {0} agent {1} in {2}, tp flags {3}", | 3352 | // "[SCENE PRESENCE]: Sending initial data to {0} agent {1} in {2}, tp flags {3}", |
3356 | IsChildAgent ? "child" : "root", Name, Scene.Name, m_teleportFlags); | 3353 | // IsChildAgent ? "child" : "root", Name, Scene.Name, m_teleportFlags); |
3357 | 3354 | ||
3358 | // we created a new ScenePresence (a new child agent) in a fresh region. | 3355 | // we created a new ScenePresence (a new child agent) in a fresh region. |
3359 | // Request info about all the (root) agents in this region | 3356 | // Request info about all the (root) agents in this region |