diff options
author | Melanie | 2012-10-02 00:51:38 +0100 |
---|---|---|
committer | Melanie | 2012-10-02 00:51:38 +0100 |
commit | 402128bb536ba19bd9c9962146ca04ad493de4e3 (patch) | |
tree | 34bdfd4119222bfd421f296a48bc92e51e60c648 /OpenSim/Region/Framework | |
parent | On more virtual method (diff) | |
download | opensim-SC-402128bb536ba19bd9c9962146ca04ad493de4e3.zip opensim-SC-402128bb536ba19bd9c9962146ca04ad493de4e3.tar.gz opensim-SC-402128bb536ba19bd9c9962146ca04ad493de4e3.tar.bz2 opensim-SC-402128bb536ba19bd9c9962146ca04ad493de4e3.tar.xz |
Prevent the ExtraSettings code from crashing SQLite driven sims.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2e03874..0a4aa4a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5545,6 +5545,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
5545 | 5545 | ||
5546 | public void StoreExtraSetting(string name, string val) | 5546 | public void StoreExtraSetting(string name, string val) |
5547 | { | 5547 | { |
5548 | if (m_extraSettings == null) | ||
5549 | return; | ||
5550 | |||
5548 | string oldVal; | 5551 | string oldVal; |
5549 | 5552 | ||
5550 | if (m_extraSettings.TryGetValue(name, out oldVal)) | 5553 | if (m_extraSettings.TryGetValue(name, out oldVal)) |
@@ -5562,6 +5565,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
5562 | 5565 | ||
5563 | public void RemoveExtraSetting(string name) | 5566 | public void RemoveExtraSetting(string name) |
5564 | { | 5567 | { |
5568 | if (m_extraSettings == null) | ||
5569 | return; | ||
5570 | |||
5565 | if (!m_extraSettings.ContainsKey(name)) | 5571 | if (!m_extraSettings.ContainsKey(name)) |
5566 | return; | 5572 | return; |
5567 | 5573 | ||