aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-10-02 00:51:38 +0100
committerMelanie2012-10-02 00:51:38 +0100
commit402128bb536ba19bd9c9962146ca04ad493de4e3 (patch)
tree34bdfd4119222bfd421f296a48bc92e51e60c648
parentOn more virtual method (diff)
downloadopensim-SC_OLD-402128bb536ba19bd9c9962146ca04ad493de4e3.zip
opensim-SC_OLD-402128bb536ba19bd9c9962146ca04ad493de4e3.tar.gz
opensim-SC_OLD-402128bb536ba19bd9c9962146ca04ad493de4e3.tar.bz2
opensim-SC_OLD-402128bb536ba19bd9c9962146ca04ad493de4e3.tar.xz
Prevent the ExtraSettings code from crashing SQLite driven sims.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
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