From c7948a669a200af1f18b125c22467f02ecb4784d Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Mon, 17 Sep 2012 13:03:34 +0100
Subject: preventing a null reference exception from being thrown

Signed-off-by: Melanie <melanie@t-data.com>
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c2c0b96..9c3c53d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5527,6 +5527,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public string GetExtraSetting(string name)
         {
+            if (m_extraSettings == null)
+                return String.Empty;
+
             string val;
 
             if (!m_extraSettings.TryGetValue(name, out val))
-- 
cgit v1.1