aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-06-11 17:47:00 +0000
committermingchen2007-06-11 17:47:00 +0000
commit009bba7cdd6dfadea614367067daa9d4e6722e6c (patch)
treee0a30a4979de25728e776b2c3a777fb00654087b
parent*Added and updated copyright headers on all files in both OpenSim and OGS (diff)
downloadopensim-SC-009bba7cdd6dfadea614367067daa9d4e6722e6c.zip
opensim-SC-009bba7cdd6dfadea614367067daa9d4e6722e6c.tar.gz
opensim-SC-009bba7cdd6dfadea614367067daa9d4e6722e6c.tar.bz2
opensim-SC-009bba7cdd6dfadea614367067daa9d4e6722e6c.tar.xz
*Removed AdminWebFront -- Unused
-rw-r--r--OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs59
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj3
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionServerBase.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/UDPServer.cs1
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs5
5 files changed, 0 insertions, 69 deletions
diff --git a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
deleted file mode 100644
index 3536fa7..0000000
--- a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ /dev/null
@@ -1,59 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.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 System.Collections.Generic;
30using System.Text;
31using System.IO;
32using OpenSim.UserServer;
33using OpenSim.Servers;
34using OpenSim.Assets;
35using OpenSim.Framework.Inventory;
36using libsecondlife;
37using Avatar=libsecondlife.Avatar;
38
39namespace OpenSim.CAPS
40{
41 public class AdminWebFront
42 {
43 private string AdminPage;
44 private string NewAccountForm;
45 private string LoginForm;
46 private string passWord = "Admin";
47
48
49 public AdminWebFront(string password)
50 {
51 passWord = password;
52 }
53
54 public void LoadMethods( BaseHttpServer server )
55 {
56
57 }
58 }
59}
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 59ecc92..75b70b4 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -179,9 +179,6 @@
179 <Compile Include="Assets\InventoryCache.cs"> 179 <Compile Include="Assets\InventoryCache.cs">
180 <SubType>Code</SubType> 180 <SubType>Code</SubType>
181 </Compile> 181 </Compile>
182 <Compile Include="CAPS\AdminWebFront.cs">
183 <SubType>Code</SubType>
184 </Compile>
185 </ItemGroup> 182 </ItemGroup>
186 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 183 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
187 <PropertyGroup> 184 <PropertyGroup>
diff --git a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
index 9fd1aa5..e6ecf6e 100644
--- a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
@@ -43,7 +43,6 @@ using OpenSim.Framework.Types;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.UserServer; 44using OpenSim.UserServer;
45using OpenSim.Assets; 45using OpenSim.Assets;
46using OpenSim.CAPS;
47using OpenSim.Framework.Console; 46using OpenSim.Framework.Console;
48using OpenSim.Physics.Manager; 47using OpenSim.Physics.Manager;
49using Nwc.XmlRpc; 48using Nwc.XmlRpc;
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 474e011..8f2c1f1 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -42,7 +42,6 @@ using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.UserServer; 43using OpenSim.UserServer;
44using OpenSim.Assets; 44using OpenSim.Assets;
45using OpenSim.CAPS;
46using OpenSim.Framework.Console; 45using OpenSim.Framework.Console;
47using OpenSim.Framework; 46using OpenSim.Framework;
48using Nwc.XmlRpc; 47using Nwc.XmlRpc;
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 52f12f7..519e73c 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -45,7 +45,6 @@ using OpenSim.Framework.Types;
45using OpenSim.Framework; 45using OpenSim.Framework;
46using OpenSim.UserServer; 46using OpenSim.UserServer;
47using OpenSim.Assets; 47using OpenSim.Assets;
48using OpenSim.CAPS;
49using OpenSim.Framework.Console; 48using OpenSim.Framework.Console;
50using OpenSim.Physics.Manager; 49using OpenSim.Physics.Manager;
51using Nwc.XmlRpc; 50using Nwc.XmlRpc;
@@ -136,10 +135,6 @@ namespace OpenSim
136 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); 135 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
137 } 136 }
138 137
139 //Web front end setup
140 AdminWebFront adminWebFront = new AdminWebFront("Admin");
141 adminWebFront.LoadMethods(httpServer);
142
143 //Start http server 138 //Start http server
144 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server"); 139 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server");
145 httpServer.Start(); 140 httpServer.Start();