diff options
author | Dan Lake | 2012-02-02 17:39:05 -0800 |
---|---|---|
committer | Dan Lake | 2012-02-02 17:39:05 -0800 |
commit | ee2b2aadc3daf4eb7ff51093aca5377b5adcfd1e (patch) | |
tree | e09c249b73782ccc3c683f3be91f118739521c92 | |
parent | Add event RegionHeartbeatEnd for modules interested in coordinating activity ... (diff) | |
download | opensim-SC_OLD-ee2b2aadc3daf4eb7ff51093aca5377b5adcfd1e.zip opensim-SC_OLD-ee2b2aadc3daf4eb7ff51093aca5377b5adcfd1e.tar.gz opensim-SC_OLD-ee2b2aadc3daf4eb7ff51093aca5377b5adcfd1e.tar.bz2 opensim-SC_OLD-ee2b2aadc3daf4eb7ff51093aca5377b5adcfd1e.tar.xz |
fix line endings
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 0889d92..e2664dd 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -447,16 +447,16 @@ namespace OpenSim.Framework | |||
447 | 447 | ||
448 | public string GetOtherSetting(string key) | 448 | public string GetOtherSetting(string key) |
449 | { | 449 | { |
450 | string val; | 450 | string val; |
451 | string keylower = key.ToLower(); | 451 | string keylower = key.ToLower(); |
452 | if (m_otherSettings.TryGetValue(keylower, out val)) | 452 | if (m_otherSettings.TryGetValue(keylower, out val)) |
453 | return val; | 453 | return val; |
454 | m_log.DebugFormat("[RegionInfo] Could not locate value for parameter {0}", key); | 454 | m_log.DebugFormat("[RegionInfo] Could not locate value for parameter {0}", key); |
455 | return null; | 455 | return null; |
456 | } | 456 | } |
457 | 457 | ||
458 | public void SetOtherSetting(string key, string value) | 458 | public void SetOtherSetting(string key, string value) |
459 | { | 459 | { |
460 | string keylower = key.ToLower(); | 460 | string keylower = key.ToLower(); |
461 | m_otherSettings[keylower] = value; | 461 | m_otherSettings[keylower] = value; |
462 | } | 462 | } |
@@ -621,7 +621,7 @@ namespace OpenSim.Framework | |||
621 | // Multi-tenancy | 621 | // Multi-tenancy |
622 | // | 622 | // |
623 | ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString())); | 623 | ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString())); |
624 | allKeys.Remove("ScopeID"); | 624 | allKeys.Remove("ScopeID"); |
625 | 625 | ||
626 | foreach (String s in allKeys) | 626 | foreach (String s in allKeys) |
627 | { | 627 | { |