diff options
author | Teravus Ovares | 2008-02-11 05:19:54 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-02-11 05:19:54 +0000 |
commit | e6453d9b9d347ee366590c05053f38abb4852b43 (patch) | |
tree | ef7fbec17f32ffccd800d102c5947b14b83dec34 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | * um, Prim crossings? Experimental. (diff) | |
download | opensim-SC-e6453d9b9d347ee366590c05053f38abb4852b43.zip opensim-SC-e6453d9b9d347ee366590c05053f38abb4852b43.tar.gz opensim-SC-e6453d9b9d347ee366590c05053f38abb4852b43.tar.bz2 opensim-SC-e6453d9b9d347ee366590c05053f38abb4852b43.tar.xz |
* Changed child_get_tasks to see_into_this_sim_from_neighbor.
* Turned on see_into_this_sim_from_neighbor by default.
* Fix Race Condition with parts being added to a group while the simulator is starting up.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 21710c0..8155b10 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -428,7 +428,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
428 | 428 | ||
429 | if (!m_gotAllObjectsInScene) | 429 | if (!m_gotAllObjectsInScene) |
430 | { | 430 | { |
431 | if (!m_isChildAgent || m_scene.m_sendTasksToChild) | 431 | if (!m_isChildAgent || m_scene.m_seeIntoRegionFromNeighbor) |
432 | { | 432 | { |
433 | 433 | ||
434 | m_scene.SendAllSceneObjectsToClient(this); | 434 | m_scene.SendAllSceneObjectsToClient(this); |
@@ -1358,7 +1358,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1358 | SendFullUpdateToOtherClient(avatar); | 1358 | SendFullUpdateToOtherClient(avatar); |
1359 | if (avatar.LocalId != LocalId) | 1359 | if (avatar.LocalId != LocalId) |
1360 | { | 1360 | { |
1361 | if (!avatar.m_isChildAgent || m_scene.m_sendTasksToChild) | 1361 | if (!avatar.m_isChildAgent || m_scene.m_seeIntoRegionFromNeighbor) |
1362 | { | 1362 | { |
1363 | avatar.SendFullUpdateToOtherClient(this); | 1363 | avatar.SendFullUpdateToOtherClient(this); |
1364 | avatar.SendAppearanceToOtherAgent(this); | 1364 | avatar.SendAppearanceToOtherAgent(this); |
@@ -1638,7 +1638,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1638 | 1638 | ||
1639 | 1639 | ||
1640 | // Sends out the objects in the user's draw distance if m_sendTasksToChild is true. | 1640 | // Sends out the objects in the user's draw distance if m_sendTasksToChild is true. |
1641 | if (m_scene.m_sendTasksToChild) | 1641 | if (m_scene.m_seeIntoRegionFromNeighbor) |
1642 | m_scene.SendAllSceneObjectsToClient(this); | 1642 | m_scene.SendAllSceneObjectsToClient(this); |
1643 | //cAgentData.AVHeight; | 1643 | //cAgentData.AVHeight; |
1644 | //cAgentData.regionHandle; | 1644 | //cAgentData.regionHandle; |