diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Server/Handlers/Base | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Server/Handlers/Base')
-rw-r--r-- | OpenSim/Server/Handlers/Base/ServerConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Base/ServerConnector.cs b/OpenSim/Server/Handlers/Base/ServerConnector.cs index 72014db..0a4df54 100644 --- a/OpenSim/Server/Handlers/Base/ServerConnector.cs +++ b/OpenSim/Server/Handlers/Base/ServerConnector.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Server.Handlers.Base | |||
72 | 72 | ||
73 | // We call this from our plugin module to get our configuration | 73 | // We call this from our plugin module to get our configuration |
74 | public IConfig GetConfig() | 74 | public IConfig GetConfig() |
75 | { | 75 | { |
76 | IConfig config = null; | 76 | IConfig config = null; |
77 | config = ServerUtils.GetConfig(ConfigFile, ConfigName); | 77 | config = ServerUtils.GetConfig(ConfigFile, ConfigName); |
78 | 78 | ||
@@ -96,12 +96,12 @@ namespace OpenSim.Server.Handlers.Base | |||
96 | 96 | ||
97 | // We get our remote initial configuration for bootstrapping in case | 97 | // We get our remote initial configuration for bootstrapping in case |
98 | // we have no configuration in our main file or in an existing | 98 | // we have no configuration in our main file or in an existing |
99 | // modular config file. This is the last resort to bootstrap the | 99 | // modular config file. This is the last resort to bootstrap the |
100 | // configuration, likely a new plugin loading for the first time. | 100 | // configuration, likely a new plugin loading for the first time. |
101 | private IConfigSource GetConfigSource() | 101 | private IConfigSource GetConfigSource() |
102 | { | 102 | { |
103 | IConfigSource source = null; | 103 | IConfigSource source = null; |
104 | 104 | ||
105 | source = ServerUtils.LoadInitialConfig(ConfigURL); | 105 | source = ServerUtils.LoadInitialConfig(ConfigURL); |
106 | 106 | ||
107 | if (source == null) | 107 | if (source == null) |