diff options
| author | Diva Canto | 2009-08-17 05:55:38 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-17 05:55:38 -0700 |
| commit | fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9 (patch) | |
| tree | 7bee741b06e6732fae848bef3c6b7f808ab3349a /OpenSim/Server | |
| parent | Bumped up grid services interface number. (diff) | |
| parent | Add System.Xml reference to the console project (diff) | |
| download | opensim-SC_OLD-fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9.zip opensim-SC_OLD-fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9.tar.gz opensim-SC_OLD-fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9.tar.bz2 opensim-SC_OLD-fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Base/HttpServerBase.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index 2142f87..791e1ef 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
| @@ -77,16 +77,16 @@ namespace OpenSim.Server.Base | |||
| 77 | m_HttpServer = new BaseHttpServer(port); | 77 | m_HttpServer = new BaseHttpServer(port); |
| 78 | 78 | ||
| 79 | MainServer.Instance = m_HttpServer; | 79 | MainServer.Instance = m_HttpServer; |
| 80 | |||
| 81 | if (MainConsole.Instance is RemoteConsole) | ||
| 82 | { | ||
| 83 | ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer); | ||
| 84 | } | ||
| 85 | } | 80 | } |
| 86 | 81 | ||
| 87 | protected override void Initialise() | 82 | protected override void Initialise() |
| 88 | { | 83 | { |
| 89 | m_HttpServer.Start(); | 84 | m_HttpServer.Start(); |
| 85 | |||
| 86 | if (MainConsole.Instance is RemoteConsole) | ||
| 87 | { | ||
| 88 | ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer); | ||
| 89 | } | ||
| 90 | } | 90 | } |
| 91 | } | 91 | } |
| 92 | } | 92 | } |