OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bugs in earlier commit on custom user parameters in Regions.ini

iar_mods
Dan Lake 2012-01-19 02:52:05 -08:00
parent 3a2ac0e2ee
commit f8079bcd72
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Framework/RegionInfo.cs
View File

@ -448,13 +448,17 @@ namespace OpenSim.Framework
public string GetOtherSetting(string key) public string GetOtherSetting(string key)
{ {
string val; string val;
m_otherSettings.TryGetValue(key, out val); string keylower = key.ToLower();
if (m_otherSettings.TryGetValue(keylower, out val))
return 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 SetOtherSetting(string key, string value)
{ {
m_otherSettings[key] = value; string keylower = key.ToLower();
m_otherSettings[keylower] = value;
} }
private void ReadNiniConfig(IConfigSource source, string name) private void ReadNiniConfig(IConfigSource source, string name)
@ -496,12 +500,12 @@ namespace OpenSim.Framework
HashSet<String> allKeys = new HashSet<String>(); HashSet<String> allKeys = new HashSet<String>();
foreach (string s in config.GetKeys()) foreach (string s in config.GetKeys())
{ {
allKeys.Add(s.ToLower()); allKeys.Add(s);
} }
// RegionUUID // RegionUUID
// //
allKeys.Remove(("RegionUUID").ToLower()); allKeys.Remove("RegionUUID");
string regionUUID = config.GetString("RegionUUID", string.Empty); string regionUUID = config.GetString("RegionUUID", string.Empty);
if (regionUUID == String.Empty) if (regionUUID == String.Empty)
{ {
@ -516,7 +520,7 @@ namespace OpenSim.Framework
// Location // Location
// //
allKeys.Remove(("Location").ToLower()); allKeys.Remove("Location");
string location = config.GetString("Location", String.Empty); string location = config.GetString("Location", String.Empty);
if (location == String.Empty) if (location == String.Empty)
{ {
@ -532,7 +536,7 @@ namespace OpenSim.Framework
// InternalAddress // InternalAddress
// //
IPAddress address; IPAddress address;
allKeys.Remove(("InternalAddress").ToLower()); allKeys.Remove("InternalAddress");
if (config.Contains("InternalAddress")) if (config.Contains("InternalAddress"))
{ {
address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty)); address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty));
@ -546,7 +550,7 @@ namespace OpenSim.Framework
// InternalPort // InternalPort
// //
int port; int port;
allKeys.Remove(("InternalPort").ToLower()); allKeys.Remove("InternalPort");
if (config.Contains("InternalPort")) if (config.Contains("InternalPort"))
{ {
port = config.GetInt("InternalPort", 9000); port = config.GetInt("InternalPort", 9000);
@ -560,7 +564,7 @@ namespace OpenSim.Framework
// AllowAlternatePorts // AllowAlternatePorts
// //
allKeys.Remove(("AllowAlternatePorts").ToLower()); allKeys.Remove("AllowAlternatePorts");
if (config.Contains("AllowAlternatePorts")) if (config.Contains("AllowAlternatePorts"))
{ {
m_allow_alternate_ports = config.GetBoolean("AllowAlternatePorts", true); m_allow_alternate_ports = config.GetBoolean("AllowAlternatePorts", true);
@ -574,7 +578,7 @@ namespace OpenSim.Framework
// ExternalHostName // ExternalHostName
// //
allKeys.Remove(("ExternalHostName").ToLower()); allKeys.Remove("ExternalHostName");
string externalName; string externalName;
if (config.Contains("ExternalHostName")) if (config.Contains("ExternalHostName"))
{ {
@ -599,29 +603,30 @@ namespace OpenSim.Framework
// RegionType // RegionType
m_regionType = config.GetString("RegionType", String.Empty); m_regionType = config.GetString("RegionType", String.Empty);
allKeys.Remove(("RegionType").ToLower()); allKeys.Remove("RegionType");
// Prim stuff // Prim stuff
// //
m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256); m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256);
allKeys.Remove(("NonphysicalPrimMax").ToLower()); allKeys.Remove("NonphysicalPrimMax");
m_physPrimMax = config.GetInt("PhysicalPrimMax", 10); m_physPrimMax = config.GetInt("PhysicalPrimMax", 10);
allKeys.Remove(("PhysicalPrimMax").ToLower()); allKeys.Remove("PhysicalPrimMax");
m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
allKeys.Remove(("ClampPrimSize").ToLower()); allKeys.Remove("ClampPrimSize");
m_objectCapacity = config.GetInt("MaxPrims", 15000); m_objectCapacity = config.GetInt("MaxPrims", 15000);
allKeys.Remove(("MaxPrims").ToLower()); allKeys.Remove("MaxPrims");
m_agentCapacity = config.GetInt("MaxAgents", 100); m_agentCapacity = config.GetInt("MaxAgents", 100);
allKeys.Remove(("MaxAgents").ToLower()); allKeys.Remove("MaxAgents");
// Multi-tenancy // Multi-tenancy
// //
ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString())); ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString()));
allKeys.Remove(("ScopeID").ToLower()); allKeys.Remove("ScopeID");
foreach (String s in allKeys) foreach (String s in allKeys)
{ {
m_otherSettings.Add(s, config.GetString(s)); string val = config.GetString(s);
SetOtherSetting(s, config.GetString(s));
} }
} }