diff --git a/OpenSim/Servers/Base/HttpServerBase.cs b/OpenSim/Servers/Base/HttpServerBase.cs
new file mode 100644
index 0000000000..f36c6c92c8
--- /dev/null
+++ b/OpenSim/Servers/Base/HttpServerBase.cs
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Threading;
+using System.Reflection;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers.HttpServer;
+using log4net;
+using Nini.Config;
+
+namespace OpenSim.Servers.Base
+{
+ public class HttpServerBase : ServicesServerBase
+ {
+ // Logger
+ //
+ private static readonly ILog m_log =
+ LogManager.GetLogger(
+ MethodBase.GetCurrentMethod().DeclaringType);
+
+ // The http server instance
+ //
+ protected BaseHttpServer m_HttpServer = null;
+
+ // Handle all the automagical stuff
+ //
+ public HttpServerBase(string prompt, string[] args) : base(prompt, args)
+ {
+ }
+
+ protected override void ReadConfig()
+ {
+ IConfig networkConfig = m_Config.Configs["Network"];
+
+ if (networkConfig == null)
+ {
+ System.Console.WriteLine("Section 'Network' not found, server can't start");
+ Thread.CurrentThread.Abort();
+ }
+ uint port = (uint)networkConfig.GetInt("port", 0);
+
+ if (port == 0)
+ {
+ System.Console.WriteLine("Port number not specified or 0, server can't start");
+ Thread.CurrentThread.Abort();
+ }
+
+ m_HttpServer = new BaseHttpServer(port);
+ }
+
+ protected override void Initialise()
+ {
+ m_HttpServer.Start();
+ }
+ }
+}
diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Servers/Base/ServicesServerBase.cs
index cc9b7789ff..2673cbe626 100644
--- a/OpenSim/Servers/Base/ServicesServerBase.cs
+++ b/OpenSim/Servers/Base/ServicesServerBase.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Servers.Base
// Configuration
//
- IConfigSource m_Config = null;
+ protected IConfigSource m_Config = null;
// Run flag
//
diff --git a/prebuild.xml b/prebuild.xml
index c9bc1847ff..5daa37dbde 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2821,11 +2821,12 @@
+
-
+