aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-18 21:04:25 +0000
committerMelanie Thielker2009-05-18 21:04:25 +0000
commitf7dbfe63e55ca875c1079084c4ca153f9a815327 (patch)
treefd73a0ddac4237b6f7ee5fc5462d89c557739ff6 /OpenSim/Server/Handlers
parentDLL name change in config var. (diff)
downloadopensim-SC_OLD-f7dbfe63e55ca875c1079084c4ca153f9a815327.zip
opensim-SC_OLD-f7dbfe63e55ca875c1079084c4ca153f9a815327.tar.gz
opensim-SC_OLD-f7dbfe63e55ca875c1079084c4ca153f9a815327.tar.bz2
opensim-SC_OLD-f7dbfe63e55ca875c1079084c4ca153f9a815327.tar.xz
This commit changes the way the new server works. There is no longer a server
exe for each function, rather each function is a connector and the server ini loads them. If you like your multiple processes, use -inifile with the server. Otherwise, you get one server process that serves all configured funcions, see example .ini. The new exe is OpenSim.Server.exe. Clean your bin, loads of names have changed!
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerConnector.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 64014f5..686e6dd 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -30,14 +30,16 @@ using Nini.Config;
30using OpenSim.Server.Base; 30using OpenSim.Server.Base;
31using OpenSim.Services.Interfaces; 31using OpenSim.Services.Interfaces;
32using OpenSim.Framework.Servers.HttpServer; 32using OpenSim.Framework.Servers.HttpServer;
33using OpenSim.Server.Handlers.Base;
33 34
34namespace OpenSim.Server.Handlers.Asset 35namespace OpenSim.Server.Handlers.Asset
35{ 36{
36 public class AssetServiceConnector 37 public class AssetServiceConnector : ServiceConnector
37 { 38 {
38 private IAssetService m_AssetService; 39 private IAssetService m_AssetService;
39 40
40 public AssetServiceConnector(IConfigSource config, IHttpServer server) 41 public AssetServiceConnector(IConfigSource config, IHttpServer server) :
42 base(config, server)
41 { 43 {
42 IConfig serverConfig = config.Configs["AssetService"]; 44 IConfig serverConfig = config.Configs["AssetService"];
43 if (serverConfig == null) 45 if (serverConfig == null)