From 9f18e3ba80a6469b7ff03c7cca595a0a3b999592 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 22 Mar 2015 21:53:02 -0700
Subject: 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.
---
OpenSim/Framework/RegionInfo.cs | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Framework/RegionInfo.cs')
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
public uint WorldLocX = 0;
public uint WorldLocY = 0;
public uint WorldLocZ = 0;
+
+ ///
+ /// X dimension of the region.
+ ///
+ ///
+ /// If this is a varregion then the default size set here will be replaced when we load the region config.
+ ///
public uint RegionSizeX = Constants.RegionSize;
+
+ ///
+ /// X dimension of the region.
+ ///
+ ///
+ /// If this is a varregion then the default size set here will be replaced when we load the region config.
+ ///
public uint RegionSizeY = Constants.RegionSize;
+
+ ///
+ /// Z dimension of the region.
+ ///
+ ///
+ /// XXX: Unknown if this accounts for regions with negative Z.
+ ///
public uint RegionSizeZ = Constants.RegionHeight;
- private Dictionary m_otherSettings = new Dictionary();
+ private Dictionary m_extraSettings = new Dictionary();
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
@@ -506,16 +527,16 @@ namespace OpenSim.Framework
{
string val;
string keylower = key.ToLower();
- if (m_otherSettings.TryGetValue(keylower, out val))
+ if (m_extraSettings.TryGetValue(keylower, out val))
return val;
m_log.DebugFormat("[RegionInfo] Could not locate value for parameter {0}", key);
return null;
}
- public void SetOtherSetting(string key, string value)
+ public void SetExtraSetting(string key, string value)
{
string keylower = key.ToLower();
- m_otherSettings[keylower] = value;
+ m_extraSettings[keylower] = value;
}
private void ReadNiniConfig(IConfigSource source, string name)
@@ -733,7 +754,7 @@ namespace OpenSim.Framework
foreach (String s in allKeys)
{
- SetOtherSetting(s, config.GetString(s));
+ SetExtraSetting(s, config.GetString(s));
}
}
--
cgit v1.1