diff options
| author | Kitto Flora | 2009-09-30 19:07:18 +0200 |
|---|---|---|
| committer | Kitto Flora | 2009-09-30 19:07:18 +0200 |
| commit | 07df0e0ab0c69633a6afec8d05cccc117656d3d9 (patch) | |
| tree | 3048cc38b313e255cbf03fa3e2900e28cadc47c9 /OpenSim/Server/Handlers/Base | |
| parent | And another merge issue (diff) | |
| parent | Fix loading modules with alternate configurations and ports into ROBUST. (diff) | |
| download | opensim-SC-07df0e0ab0c69633a6afec8d05cccc117656d3d9.zip opensim-SC-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.gz opensim-SC-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.bz2 opensim-SC-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.xz | |
Merge branch '0.6.7-post-fixes' into vehicles
Diffstat (limited to 'OpenSim/Server/Handlers/Base')
| -rw-r--r-- | OpenSim/Server/Handlers/Base/ServerConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Base/ServerConnector.cs b/OpenSim/Server/Handlers/Base/ServerConnector.cs index 62fe773..71876da 100644 --- a/OpenSim/Server/Handlers/Base/ServerConnector.cs +++ b/OpenSim/Server/Handlers/Base/ServerConnector.cs | |||
| @@ -39,7 +39,7 @@ namespace OpenSim.Server.Handlers.Base | |||
| 39 | 39 | ||
| 40 | public class ServiceConnector : IServiceConnector | 40 | public class ServiceConnector : IServiceConnector |
| 41 | { | 41 | { |
| 42 | public ServiceConnector(IConfigSource config, IHttpServer server) | 42 | public ServiceConnector(IConfigSource config, IHttpServer server, string configName) |
| 43 | { | 43 | { |
| 44 | } | 44 | } |
| 45 | } | 45 | } |