aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/AssetServer
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/AssetServer
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/AssetServer')
-rw-r--r--OpenSim/Server/AssetServer/AssetServerMain.cs50
1 files changed, 0 insertions, 50 deletions
diff --git a/OpenSim/Server/AssetServer/AssetServerMain.cs b/OpenSim/Server/AssetServer/AssetServerMain.cs
deleted file mode 100644
index b08c8cf..0000000
--- a/OpenSim/Server/AssetServer/AssetServerMain.cs
+++ /dev/null
@@ -1,50 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using OpenSim.Server.Base;
30using OpenSim.Server.Handlers.Asset;
31
32namespace OpenSim.Server.AssetServer
33{
34 public class AssetServer
35 {
36 protected static HttpServerBase m_Server = null;
37
38 protected static AssetServiceConnector m_AssetServiceConnector;
39
40 static int Main(string[] args)
41 {
42 m_Server = new HttpServerBase("Asset", args);
43
44 m_AssetServiceConnector = new AssetServiceConnector(m_Server.Config,
45 m_Server.HttpServer);
46
47 return m_Server.Run();
48 }
49 }
50}