diff options
author | Kitto Flora | 2009-09-30 19:07:18 +0200 |
---|---|---|
committer | Kitto Flora | 2009-09-30 19:07:18 +0200 |
commit | 07df0e0ab0c69633a6afec8d05cccc117656d3d9 (patch) | |
tree | 3048cc38b313e255cbf03fa3e2900e28cadc47c9 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
parent | And another merge issue (diff) | |
parent | Fix loading modules with alternate configurations and ports into ROBUST. (diff) | |
download | opensim-SC-07df0e0ab0c69633a6afec8d05cccc117656d3d9.zip opensim-SC-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.gz opensim-SC-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.bz2 opensim-SC-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.xz |
Merge branch '0.6.7-post-fixes' into vehicles
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 204c319..5f2333e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -63,6 +63,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
63 | 63 | ||
64 | protected List<UUID> m_agentsInTransit; | 64 | protected List<UUID> m_agentsInTransit; |
65 | 65 | ||
66 | public bool RegionLoginsEnabled | ||
67 | { | ||
68 | get { return m_regionLoginsEnabled; } | ||
69 | set { m_regionLoginsEnabled = value; } | ||
70 | } | ||
71 | private bool m_regionLoginsEnabled = false; | ||
72 | |||
66 | /// <summary> | 73 | /// <summary> |
67 | /// An agent is crossing into this region | 74 | /// An agent is crossing into this region |
68 | /// </summary> | 75 | /// </summary> |
@@ -1163,7 +1170,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1163 | } | 1170 | } |
1164 | } | 1171 | } |
1165 | 1172 | ||
1166 | private bool IsOutsideRegion(Scene s, Vector3 pos) | 1173 | protected bool IsOutsideRegion(Scene s, Vector3 pos) |
1167 | { | 1174 | { |
1168 | 1175 | ||
1169 | if (s.TestBorderCross(pos,Cardinals.N)) | 1176 | if (s.TestBorderCross(pos,Cardinals.N)) |