diff options
| author | SignpostMarv | 2012-09-17 13:03:34 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-17 13:29:15 +0100 |
| commit | c7948a669a200af1f18b125c22467f02ecb4784d (patch) | |
| tree | 05e66ae10eb5496f5d8d0cc032b7912075082785 /OpenSim | |
| parent | script invocations cannot have void return type (diff) | |
| download | opensim-SC-c7948a669a200af1f18b125c22467f02ecb4784d.zip opensim-SC-c7948a669a200af1f18b125c22467f02ecb4784d.tar.gz opensim-SC-c7948a669a200af1f18b125c22467f02ecb4784d.tar.bz2 opensim-SC-c7948a669a200af1f18b125c22467f02ecb4784d.tar.xz | |
preventing a null reference exception from being thrown
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 3 insertions, 0 deletions
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 | |||
| 5527 | 5527 | ||
| 5528 | public string GetExtraSetting(string name) | 5528 | public string GetExtraSetting(string name) |
| 5529 | { | 5529 | { |
| 5530 | if (m_extraSettings == null) | ||
| 5531 | return String.Empty; | ||
| 5532 | |||
| 5530 | string val; | 5533 | string val; |
| 5531 | 5534 | ||
| 5532 | if (!m_extraSettings.TryGetValue(name, out val)) | 5535 | if (!m_extraSettings.TryGetValue(name, out val)) |