aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-11-11 02:47:17 -0500
committerTeravus Ovares (Dan Olivares)2009-11-11 02:47:17 -0500
commit4a2d82e14b4d00671b454d4848b6b4cef26d3e56 (patch)
treeb35be2bbaaaedbb1da94ebb360c0df653d526c0d /OpenSim/Region/Framework
parent* Fix resources file mapping (diff)
downloadopensim-SC_OLD-4a2d82e14b4d00671b454d4848b6b4cef26d3e56.zip
opensim-SC_OLD-4a2d82e14b4d00671b454d4848b6b4cef26d3e56.tar.gz
opensim-SC_OLD-4a2d82e14b4d00671b454d4848b6b4cef26d3e56.tar.bz2
opensim-SC_OLD-4a2d82e14b4d00671b454d4848b6b4cef26d3e56.tar.xz
* Thanks to a little help from jhurliman, jradford, diva, mono's brajkovic, miguel, and the fabulous bug reports by our community members.. The workaround fix for the "ERROR:metadata.c:3211:mono_metadata_token_from_dor: code should not be reached" bug in the RegionCombinerModule.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6edef11..4531e06 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -88,8 +88,18 @@ namespace OpenSim.Region.Framework.Scenes
88 protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>(); 88 protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>();
89 protected List<RegionInfo> m_neighbours = new List<RegionInfo>(); 89 protected List<RegionInfo> m_neighbours = new List<RegionInfo>();
90 90
91 public volatile bool BordersLocked = false; 91 private volatile int m_bordersLocked = 0;
92 92 public bool BordersLocked
93 {
94 get { return m_bordersLocked == 1; }
95 set
96 {
97 if (value == true)
98 m_bordersLocked = 1;
99 else
100 m_bordersLocked = 0;
101 }
102 }
93 public List<Border> NorthBorders = new List<Border>(); 103 public List<Border> NorthBorders = new List<Border>();
94 public List<Border> EastBorders = new List<Border>(); 104 public List<Border> EastBorders = new List<Border>();
95 public List<Border> SouthBorders = new List<Border>(); 105 public List<Border> SouthBorders = new List<Border>();