diff options
| author | Justin Clark-Casey (justincc) | 2013-07-26 01:38:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-26 01:38:04 +0100 |
| commit | 72ed49af5f864e50fa4453849a94dd9d46533cba (patch) | |
| tree | f8325f04707a21ef1aa51bc351a49bec2ba3de9b /OpenSim/Region/Framework | |
| parent | If a returning teleport starts to reuse a downgraded child connection that wa... (diff) | |
| download | opensim-SC-72ed49af5f864e50fa4453849a94dd9d46533cba.zip opensim-SC-72ed49af5f864e50fa4453849a94dd9d46533cba.tar.gz opensim-SC-72ed49af5f864e50fa4453849a94dd9d46533cba.tar.bz2 opensim-SC-72ed49af5f864e50fa4453849a94dd9d46533cba.tar.xz | |
Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotClose to DoNotCloseAfterTeleport
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f4622b6..705660d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3700,7 +3700,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3700 | } | 3700 | } |
| 3701 | else | 3701 | else |
| 3702 | { | 3702 | { |
| 3703 | sp.DoNotClose = true; | 3703 | sp.DoNotCloseAfterTeleport = true; |
| 3704 | } | 3704 | } |
| 3705 | } | 3705 | } |
| 3706 | 3706 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d3e1946..4044f0c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -722,7 +722,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 722 | /// teleport is reusing the connection. | 722 | /// teleport is reusing the connection. |
| 723 | /// </summary> | 723 | /// </summary> |
| 724 | /// <remarks>May be refactored or move somewhere else soon.</remarks> | 724 | /// <remarks>May be refactored or move somewhere else soon.</remarks> |
| 725 | public bool DoNotClose { get; set; } | 725 | public bool DoNotCloseAfterTeleport { get; set; } |
| 726 | 726 | ||
| 727 | private float m_speedModifier = 1.0f; | 727 | private float m_speedModifier = 1.0f; |
| 728 | 728 | ||