diff options
| author | Diva Canto | 2012-11-27 14:43:01 -0800 |
|---|---|---|
| committer | Diva Canto | 2012-11-27 14:43:01 -0800 |
| commit | a82f699f4348ea1ab139ab338973c9cee04df712 (patch) | |
| tree | d1bf4948670e1d207fe4f6c60f6b7771e1625839 /OpenSim/Server/Base/HttpServerBase.cs | |
| parent | Prevent the core Groups module from being enabled when its name doesn't match... (diff) | |
| parent | BulletSim: reorganize linear movement routine into separate subroutines enabl... (diff) | |
| download | opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.zip opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.gz opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.bz2 opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Base/HttpServerBase.cs')
| -rw-r--r-- | OpenSim/Server/Base/HttpServerBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index 29b1c00..954783c 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
| @@ -52,7 +52,7 @@ namespace OpenSim.Server.Base | |||
| 52 | 52 | ||
| 53 | protected override void ReadConfig() | 53 | protected override void ReadConfig() |
| 54 | { | 54 | { |
| 55 | IConfig networkConfig = m_Config.Configs["Network"]; | 55 | IConfig networkConfig = Config.Configs["Network"]; |
| 56 | 56 | ||
| 57 | if (networkConfig == null) | 57 | if (networkConfig == null) |
| 58 | { | 58 | { |