diff options
| author | Melanie | 2012-09-17 14:15:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-17 14:15:22 +0100 |
| commit | 1dd75fcdb476d20b96efba64a842ac82000c400d (patch) | |
| tree | b51eed8de604358841d3cb56db267eaf379c3d3f /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | preventing a null reference exception from being thrown (diff) | |
| download | opensim-SC_OLD-1dd75fcdb476d20b96efba64a842ac82000c400d.zip opensim-SC_OLD-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.gz opensim-SC_OLD-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.bz2 opensim-SC_OLD-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 a5fcf4d..ee5f6df 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -5943,6 +5943,9 @@ Environment.Exit(1); | |||
| 5943 | 5943 | ||
| 5944 | public string GetExtraSetting(string name) | 5944 | public string GetExtraSetting(string name) |
| 5945 | { | 5945 | { |
| 5946 | if (m_extraSettings == null) | ||
| 5947 | return String.Empty; | ||
| 5948 | |||
| 5946 | string val; | 5949 | string val; |
| 5947 | 5950 | ||
| 5948 | if (!m_extraSettings.TryGetValue(name, out val)) | 5951 | if (!m_extraSettings.TryGetValue(name, out val)) |