aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2013-02-23 20:37:09 +0000
committerMelanie2013-02-23 20:37:09 +0000
commite3ea2c4beefb65ba997beab1509aa996a46f7864 (patch)
tree778cba450e788b13f4d000c6e49f3d94bd25f65c /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster (diff)
parentMore clarification on the [Groups] section (diff)
downloadopensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.zip
opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.gz
opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.bz2
opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9bc9c2d..f2aa0c5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -703,6 +703,12 @@ namespace OpenSim.Region.Framework.Scenes
703 703
704 private bool m_inTransit; 704 private bool m_inTransit;
705 705
706 /// <summary>
707 /// This signals whether the presence is in transit between neighbouring regions.
708 /// </summary>
709 /// <remarks>
710 /// It is not set when the presence is teleporting or logging in/out directly to a region.
711 /// </remarks>
706 public bool IsInTransit 712 public bool IsInTransit
707 { 713 {
708 get { return m_inTransit; } 714 get { return m_inTransit; }