* Introduced BaseHttpServer as base for UserHTTPServer and GridHTTPServer

3 files changed, 10 insertions, 2 deletions

diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 95f548c..d10710a 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -92,6 +92,12 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

+    <ProjectReference Include="..\Servers\OpenSim.Servers.csproj">

+      <Name>OpenSim.Servers</Name>

+      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="Main.cs">

diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 7212a7b..a4bccb8 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -25,6 +25,7 @@
                 <include name="System.Xml.dll" />

                 <include name="../bin/OpenSim.Framework.dll" />

                 <include name="../bin/OpenSim.Framework.Console.dll" />

+                <include name="../bin/OpenSim.Servers.dll" />

                 <include name="../bin/libsecondlife.dll" />

                 <include name="../bin/Db4objects.Db4o.dll" />

             </references>

diff --git a/OpenGridServices.UserServer/UserHttp.cs b/OpenGridServices.UserServer/UserHttp.cs
index 6fe7fc1..e1385f7 100644
--- a/OpenGridServices.UserServer/UserHttp.cs
+++ b/OpenGridServices.UserServer/UserHttp.cs
@@ -41,15 +41,16 @@ using OpenSim.Framework.User;
 using OpenSim.Framework.Sims;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Console;

+using OpenSim.Servers;

 

 namespace OpenGridServices.UserServer

 {

-    public class UserHTTPServer

+    public class UserHTTPServer : BaseHttpServer

     {

         public Thread HTTPD;

         public HttpListener Listener;

 

-        public UserHTTPServer()

+        public UserHTTPServer() : base( 8002 )

         {

             MainConsole.Instance.WriteLine("Starting up HTTP Server");

             HTTPD = new Thread(new ThreadStart(StartHTTP));