diff options
| author | onefang | 2019-07-04 16:31:53 +1000 |
|---|---|---|
| committer | onefang | 2019-07-04 16:31:53 +1000 |
| commit | 19bf45d261a8df40af85b110c96190dcf2efdaad (patch) | |
| tree | 2c3b69396fc954498363a9b8ba3848557ec3483f /OpenSim | |
| parent | Comment++. (diff) | |
| download | opensim-SC_OLD-19bf45d261a8df40af85b110c96190dcf2efdaad.zip opensim-SC_OLD-19bf45d261a8df40af85b110c96190dcf2efdaad.tar.gz opensim-SC_OLD-19bf45d261a8df40af85b110c96190dcf2efdaad.tar.bz2 opensim-SC_OLD-19bf45d261a8df40af85b110c96190dcf2efdaad.tar.xz | |
Properly combine Robust.ini path.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 1484ee0..472998a 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
| @@ -85,7 +85,7 @@ namespace OpenSim.Server.Base | |||
| 85 | string fileName = ""; | 85 | string fileName = ""; |
| 86 | if (Assembly.GetEntryAssembly() != null) | 86 | if (Assembly.GetEntryAssembly() != null) |
| 87 | fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location); | 87 | fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location); |
| 88 | string iniFile = Util.configDir() + fileName + ".ini"; | 88 | string iniFile = Path.Combine(Util.configDir(), fileName + ".ini"); |
| 89 | string logConfig = null; | 89 | string logConfig = null; |
| 90 | 90 | ||
| 91 | IConfig startupConfig = argvConfig.Configs["Startup"]; | 91 | IConfig startupConfig = argvConfig.Configs["Startup"]; |