aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.UserServer
diff options
context:
space:
mode:
authorlbsa712007-04-11 12:32:58 +0000
committerlbsa712007-04-11 12:32:58 +0000
commitc84ddd8b0d9f67926458f27d1f6d40c44ff8f355 (patch)
tree01a7d667b018f12a52028adf978f660a565f564b /OpenGridServices.UserServer
parentadded missing files (diff)
downloadopensim-SC_OLD-c84ddd8b0d9f67926458f27d1f6d40c44ff8f355.zip
opensim-SC_OLD-c84ddd8b0d9f67926458f27d1f6d40c44ff8f355.tar.gz
opensim-SC_OLD-c84ddd8b0d9f67926458f27d1f6d40c44ff8f355.tar.bz2
opensim-SC_OLD-c84ddd8b0d9f67926458f27d1f6d40c44ff8f355.tar.xz
* Introduced BaseHttpServer as base for UserHTTPServer and GridHTTPServer
Diffstat (limited to '')
-rw-r--r--OpenGridServices.UserServer/OpenGridServices.UserServer.csproj6
-rw-r--r--OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build1
-rw-r--r--OpenGridServices.UserServer/UserHttp.cs5
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 @@
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 93 <Private>False</Private>
94 </ProjectReference> 94 </ProjectReference>
95 <ProjectReference Include="..\Servers\OpenSim.Servers.csproj">
96 <Name>OpenSim.Servers</Name>
97 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private>
100 </ProjectReference>
95 </ItemGroup> 101 </ItemGroup>
96 <ItemGroup> 102 <ItemGroup>
97 <Compile Include="Main.cs"> 103 <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 @@
25 <include name="System.Xml.dll" /> 25 <include name="System.Xml.dll" />
26 <include name="../bin/OpenSim.Framework.dll" /> 26 <include name="../bin/OpenSim.Framework.dll" />
27 <include name="../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../bin/OpenSim.Framework.Console.dll" />
28 <include name="../bin/OpenSim.Servers.dll" />
28 <include name="../bin/libsecondlife.dll" /> 29 <include name="../bin/libsecondlife.dll" />
29 <include name="../bin/Db4objects.Db4o.dll" /> 30 <include name="../bin/Db4objects.Db4o.dll" />
30 </references> 31 </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;
41using OpenSim.Framework.Sims; 41using OpenSim.Framework.Sims;
42using OpenSim.Framework.Inventory; 42using OpenSim.Framework.Inventory;
43using OpenSim.Framework.Console; 43using OpenSim.Framework.Console;
44using OpenSim.Servers;
44 45
45namespace OpenGridServices.UserServer 46namespace OpenGridServices.UserServer
46{ 47{
47 public class UserHTTPServer 48 public class UserHTTPServer : BaseHttpServer
48 { 49 {
49 public Thread HTTPD; 50 public Thread HTTPD;
50 public HttpListener Listener; 51 public HttpListener Listener;
51 52
52 public UserHTTPServer() 53 public UserHTTPServer() : base( 8002 )
53 { 54 {
54 MainConsole.Instance.WriteLine("Starting up HTTP Server"); 55 MainConsole.Instance.WriteLine("Starting up HTTP Server");
55 HTTPD = new Thread(new ThreadStart(StartHTTP)); 56 HTTPD = new Thread(new ThreadStart(StartHTTP));