diff options
| author | UbitUmarov | 2016-08-24 01:34:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-24 01:34:21 +0100 |
| commit | 55680c9cd62d35e8687f53c923a3e0c775000581 (patch) | |
| tree | 97c9be0b7aa3b114bb21d475dee5fca67019774d /OpenSim | |
| parent | estate handleTerrainRequest memory leaks (diff) | |
| download | opensim-SC_OLD-55680c9cd62d35e8687f53c923a3e0c775000581.zip opensim-SC_OLD-55680c9cd62d35e8687f53c923a3e0c775000581.tar.gz opensim-SC_OLD-55680c9cd62d35e8687f53c923a3e0c775000581.tar.bz2 opensim-SC_OLD-55680c9cd62d35e8687f53c923a3e0c775000581.tar.xz | |
potencial null ref
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 1f2c54d..a7cffd7 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
| @@ -139,10 +139,12 @@ namespace OpenSim.Server.Base | |||
| 139 | startupConfig = Config.Configs["Startup"]; | 139 | startupConfig = Config.Configs["Startup"]; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | ConfigDirectory = startupConfig.GetString("ConfigDirectory", "."); | 142 | if (startupConfig != null) |
| 143 | 143 | { | |
| 144 | prompt = startupConfig.GetString("Prompt", prompt); | 144 | ConfigDirectory = startupConfig.GetString("ConfigDirectory", "."); |
| 145 | 145 | ||
| 146 | prompt = startupConfig.GetString("Prompt", prompt); | ||
| 147 | } | ||
| 146 | // Allow derived classes to load config before the console is opened. | 148 | // Allow derived classes to load config before the console is opened. |
| 147 | ReadConfig(); | 149 | ReadConfig(); |
| 148 | 150 | ||