diff options
author | Melanie | 2014-04-12 17:32:16 +0100 |
---|---|---|
committer | Melanie | 2014-04-12 17:32:16 +0100 |
commit | 574a11558dad307ad12b3930c72256ba955f0714 (patch) | |
tree | 2929546e7f7d750b9136d30f2533142d8e966502 | |
parent | Remove the old XML format parsing. Now additional region params can just be (diff) | |
download | opensim-SC_OLD-574a11558dad307ad12b3930c72256ba955f0714.zip opensim-SC_OLD-574a11558dad307ad12b3930c72256ba955f0714.tar.gz opensim-SC_OLD-574a11558dad307ad12b3930c72256ba955f0714.tar.bz2 opensim-SC_OLD-574a11558dad307ad12b3930c72256ba955f0714.tar.xz |
Refactor: Rename GetOtherSetting to GetSetting and make SetOtherSetting private
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 6b3adcc..ce14b58 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -151,7 +151,7 @@ namespace OpenSim.Framework | |||
151 | public uint RegionSizeY = Constants.RegionSize; | 151 | public uint RegionSizeY = Constants.RegionSize; |
152 | public uint RegionSizeZ = Constants.RegionHeight; | 152 | public uint RegionSizeZ = Constants.RegionHeight; |
153 | 153 | ||
154 | private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>(); | 154 | private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>(); |
155 | 155 | ||
156 | // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. | 156 | // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. |
157 | 157 | ||
@@ -501,20 +501,20 @@ namespace OpenSim.Framework | |||
501 | m_internalEndPoint = tmpEPE; | 501 | m_internalEndPoint = tmpEPE; |
502 | } | 502 | } |
503 | 503 | ||
504 | public string GetOtherSetting(string key) | 504 | public string GetSetting(string key) |
505 | { | 505 | { |
506 | string val; | 506 | string val; |
507 | string keylower = key.ToLower(); | 507 | string keylower = key.ToLower(); |
508 | if (m_otherSettings.TryGetValue(keylower, out val)) | 508 | if (m_extraSettings.TryGetValue(keylower, out val)) |
509 | return val; | 509 | return val; |
510 | m_log.DebugFormat("[RegionInfo] Could not locate value for parameter {0}", key); | 510 | m_log.DebugFormat("[RegionInfo] Could not locate value for parameter {0}", key); |
511 | return null; | 511 | return null; |
512 | } | 512 | } |
513 | 513 | ||
514 | public void SetOtherSetting(string key, string value) | 514 | private void SetExtraSetting(string key, string value) |
515 | { | 515 | { |
516 | string keylower = key.ToLower(); | 516 | string keylower = key.ToLower(); |
517 | m_otherSettings[keylower] = value; | 517 | m_extraSettings[keylower] = value; |
518 | } | 518 | } |
519 | 519 | ||
520 | private void ReadNiniConfig(IConfigSource source, string name) | 520 | private void ReadNiniConfig(IConfigSource source, string name) |
@@ -738,7 +738,7 @@ namespace OpenSim.Framework | |||
738 | 738 | ||
739 | foreach (String s in allKeys) | 739 | foreach (String s in allKeys) |
740 | { | 740 | { |
741 | SetOtherSetting(s, config.GetString(s)); | 741 | SetExtraSetting(s, config.GetString(s)); |
742 | } | 742 | } |
743 | } | 743 | } |
744 | 744 | ||