diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs index e72995018f..86894713cc 100644 --- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs @@ -92,7 +92,6 @@ namespace OpenSim.Framework.Servers.HttpServer public interface ISimpleStreamHandler { string Name { get; } - string Description { get; } string Path { get; } int RequestsReceived { get; } diff --git a/OpenSim/Framework/Servers/HttpServer/SimpleBaseRequestHandler.cs b/OpenSim/Framework/Servers/HttpServer/SimpleBaseRequestHandler.cs index 6e0ec5a397..91f2b7ce35 100644 --- a/OpenSim/Framework/Servers/HttpServer/SimpleBaseRequestHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/SimpleBaseRequestHandler.cs @@ -43,14 +43,14 @@ namespace OpenSim.Framework.Servers.HttpServer public string Name { get; private set; } - public string Description { get; private set; } - - protected SimpleBaseRequestHandler(string path) : this(path, null, null) { } - - protected SimpleBaseRequestHandler(string path, string name, string description) + protected SimpleBaseRequestHandler(string path) + { + Name = null; + m_path = path; + } + protected SimpleBaseRequestHandler(string path, string name) { Name = name; - Description = description; m_path = path; } @@ -78,12 +78,5 @@ namespace OpenSim.Framework.Servers.HttpServer return path.StartsWith(Path); } - - public string[] SplitParams(string path) - { - string param = GetParam(path); - - return param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries); - } } } \ No newline at end of file diff --git a/OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs index c64eba5f40..3b411ff655 100644 --- a/OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs @@ -43,28 +43,32 @@ namespace OpenSim.Framework.Servers.HttpServer protected IServiceAuth m_Auth; protected SimpleStreamMethod m_processRequest; - public SimpleStreamHandler(string path) : base(path, null, null) { } - public SimpleStreamHandler(string path, string name, string description) : base(path, name, description) { } + public SimpleStreamHandler(string path) : base(path) { } + public SimpleStreamHandler(string path, string name) : base(path, name) { } - public SimpleStreamHandler(string path, SimpleStreamMethod processRequest) : base(path, null, null) + public SimpleStreamHandler(string path, SimpleStreamMethod processRequest) : base(path) + { + m_processRequest = processRequest; + } + public SimpleStreamHandler(string path, SimpleStreamMethod processRequest, string name) : base(path, name) { m_processRequest = processRequest; } - public SimpleStreamHandler(string path, IServiceAuth auth) : base(path, null, null) + public SimpleStreamHandler(string path, IServiceAuth auth) : base(path) { m_Auth = auth; } public SimpleStreamHandler(string path, IServiceAuth auth, SimpleStreamMethod processRequest) - : base(path, null, null) + : base(path) { m_Auth = auth; m_processRequest = processRequest; } - public SimpleStreamHandler(string path, IServiceAuth auth, SimpleStreamMethod processRequest, string name, string description) - : base(path, name, description) + public SimpleStreamHandler(string path, IServiceAuth auth, SimpleStreamMethod processRequest, string name) + : base(path, name) { m_Auth = auth; m_processRequest = processRequest; diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 248aa3d9c5..eabede15fc 100755 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -831,7 +831,7 @@ namespace OpenSim /// public class SimStatusHandler : SimpleStreamHandler { - public SimStatusHandler() : base("/simstatus", "SimStatus", "Simulator Status") {} + public SimStatusHandler() : base("/simstatus", "SimStatus") {} protected override void ProcessRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) { @@ -850,7 +850,7 @@ namespace OpenSim OpenSimBase m_opensim; public XSimStatusHandler(OpenSimBase sim) - : base("/" + Util.SHA1Hash(sim.osSecret), "XSimStatus", "Simulator XStatus") + : base("/" + Util.SHA1Hash(sim.osSecret), "XSimStatus") { m_opensim = sim; } @@ -882,7 +882,7 @@ namespace OpenSim OpenSimBase m_opensim; public UXSimStatusHandler(OpenSimBase sim) - : base("/" + sim.userStatsURI, "UXSimStatus", "Simulator UXStatus") + : base("/" + sim.userStatsURI, "UXSimStatus") { m_opensim = sim; } @@ -908,7 +908,7 @@ namespace OpenSim public class SimRobotsHandler : SimpleStreamHandler { private readonly byte[] binmsg; - public SimRobotsHandler() : base("/robots.txt", "SimRobots.txt", "Simulator Robots.txt") + public SimRobotsHandler() : base("/robots.txt", "SimRobots") { binmsg = Util.UTF8.GetBytes("# go away\nUser-agent: *\nDisallow: /\n"); }