diff options
author | UbitUmarov | 2014-08-10 20:09:02 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-10 20:09:02 +0100 |
commit | 7fcd1068e742d88fbda94ae079e900424807d021 (patch) | |
tree | 7d08c0fde26c1199e67131eae5a159a74b13e119 /OpenSim/Region/Framework/Scenes | |
parent | actually let delay match throttles as original design (diff) | |
download | opensim-SC-7fcd1068e742d88fbda94ae079e900424807d021.zip opensim-SC-7fcd1068e742d88fbda94ae079e900424807d021.tar.gz opensim-SC-7fcd1068e742d88fbda94ae079e900424807d021.tar.bz2 opensim-SC-7fcd1068e742d88fbda94ae079e900424807d021.tar.xz |
TEST move parcelRegionCross to EntityTransferModule cross so it works on
sitting avatars. (may be bad) comented out sending root avatars
information to the child that was just a root it should have it all
already. Dont turn a sitting avatar physical, that needs to be a stand at SOG
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5acd51e..d65c250 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3863,7 +3863,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3863 | protected bool CrossToNewRegion() | 3863 | protected bool CrossToNewRegion() |
3864 | { | 3864 | { |
3865 | bool result = false; | 3865 | bool result = false; |
3866 | parcelRegionCross(false); | 3866 | // parcelRegionCross(false); |
3867 | try | 3867 | try |
3868 | { | 3868 | { |
3869 | result = m_scene.CrossAgentToNewRegion(this, Flying); | 3869 | result = m_scene.CrossAgentToNewRegion(this, Flying); |
@@ -3872,8 +3872,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3872 | { | 3872 | { |
3873 | result = m_scene.CrossAgentToNewRegion(this, false); | 3873 | result = m_scene.CrossAgentToNewRegion(this, false); |
3874 | } | 3874 | } |
3875 | if(!result) | 3875 | // if(!result) |
3876 | parcelRegionCross(true); | 3876 | // parcelRegionCross(true); |
3877 | 3877 | ||
3878 | return result; | 3878 | return result; |
3879 | 3879 | ||
@@ -5531,7 +5531,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5531 | } | 5531 | } |
5532 | } | 5532 | } |
5533 | 5533 | ||
5534 | private void parcelRegionCross(bool abort) | 5534 | public void parcelRegionCross(bool abort) |
5535 | { | 5535 | { |
5536 | if (!ParcelHideThisAvatar) | 5536 | if (!ParcelHideThisAvatar) |
5537 | return; | 5537 | return; |