aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorRobert Adams2015-03-22 21:53:02 -0700
committerRobert Adams2015-03-22 21:53:02 -0700
commit9f18e3ba80a6469b7ff03c7cca595a0a3b999592 (patch)
treec2ace74c3ffc6eab80b94bfbe4e6a2d37197eb28 /OpenSim/Framework/RegionInfo.cs
parentAllow setting the size of the wearables array from config, for core compatibi... (diff)
downloadopensim-SC_OLD-9f18e3ba80a6469b7ff03c7cca595a0a3b999592.zip
opensim-SC_OLD-9f18e3ba80a6469b7ff03c7cca595a0a3b999592.tar.gz
opensim-SC_OLD-9f18e3ba80a6469b7ff03c7cca595a0a3b999592.tar.bz2
opensim-SC_OLD-9f18e3ba80a6469b7ff03c7cca595a0a3b999592.tar.xz
Varregion: first cut at removing Border class checks for region crossings.
Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work. Many changes made to EntityTransferModule to accomodate new crossing sense logic.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs31
1 files changed, 26 insertions, 5 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ae2ff63..90188d2 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -149,11 +149,32 @@ namespace OpenSim.Framework
149 public uint WorldLocX = 0; 149 public uint WorldLocX = 0;
150 public uint WorldLocY = 0; 150 public uint WorldLocY = 0;
151 public uint WorldLocZ = 0; 151 public uint WorldLocZ = 0;
152
153 /// <summary>
154 /// X dimension of the region.
155 /// </summary>
156 /// <remarks>
157 /// If this is a varregion then the default size set here will be replaced when we load the region config.
158 /// </remarks>
152 public uint RegionSizeX = Constants.RegionSize; 159 public uint RegionSizeX = Constants.RegionSize;
160
161 /// <summary>
162 /// X dimension of the region.
163 /// </summary>
164 /// <remarks>
165 /// If this is a varregion then the default size set here will be replaced when we load the region config.
166 /// </remarks>
153 public uint RegionSizeY = Constants.RegionSize; 167 public uint RegionSizeY = Constants.RegionSize;
168
169 /// <summary>
170 /// Z dimension of the region.
171 /// </summary>
172 /// <remarks>
173 /// XXX: Unknown if this accounts for regions with negative Z.
174 /// </remarks>
154 public uint RegionSizeZ = Constants.RegionHeight; 175 public uint RegionSizeZ = Constants.RegionHeight;
155 176
156 private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>(); 177 private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>();
157 178
158 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 179 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
159 180
@@ -506,16 +527,16 @@ namespace OpenSim.Framework
506 { 527 {
507 string val; 528 string val;
508 string keylower = key.ToLower(); 529 string keylower = key.ToLower();
509 if (m_otherSettings.TryGetValue(keylower, out val)) 530 if (m_extraSettings.TryGetValue(keylower, out val))
510 return val; 531 return val;
511 m_log.DebugFormat("[RegionInfo] Could not locate value for parameter {0}", key); 532 m_log.DebugFormat("[RegionInfo] Could not locate value for parameter {0}", key);
512 return null; 533 return null;
513 } 534 }
514 535
515 public void SetOtherSetting(string key, string value) 536 public void SetExtraSetting(string key, string value)
516 { 537 {
517 string keylower = key.ToLower(); 538 string keylower = key.ToLower();
518 m_otherSettings[keylower] = value; 539 m_extraSettings[keylower] = value;
519 } 540 }
520 541
521 private void ReadNiniConfig(IConfigSource source, string name) 542 private void ReadNiniConfig(IConfigSource source, string name)
@@ -733,7 +754,7 @@ namespace OpenSim.Framework
733 754
734 foreach (String s in allKeys) 755 foreach (String s in allKeys)
735 { 756 {
736 SetOtherSetting(s, config.GetString(s)); 757 SetExtraSetting(s, config.GetString(s));
737 } 758 }
738 } 759 }
739 760