From 3bf88587277b83c0b6f058fabba7d46a3b5a6a00 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 28 Aug 2008 14:41:54 +0000 Subject: Update svn properties, formatting cleanup. --- OpenSim/Framework/Servers/BaseHttpServer.cs | 24 ++++++++++++------------ OpenSim/Framework/Servers/BaseOpenSimServer.cs | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'OpenSim/Framework/Servers') diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 79929bd..d326b66 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -278,7 +278,7 @@ namespace OpenSim.Framework.Servers HandleLLSDRequests(request, response); return; - } + } HandleXmlRpcRequests(request, response); return; } @@ -498,7 +498,7 @@ namespace OpenSim.Framework.Servers { // we didn't find a registered llsd handler to service this request // check if we have a default llsd handler - + if (m_defaultLlsdHandler != null) { // LibOMV path @@ -541,7 +541,7 @@ namespace OpenSim.Framework.Servers private bool DoWeHaveALLSDHandler(string path) { - + string[] pathbase = path.Split('/'); string searchquery = "/"; @@ -559,27 +559,27 @@ namespace OpenSim.Framework.Servers foreach (string pattern in m_llsdHandlers.Keys) { - + if (searchquery.StartsWith(pattern) && searchquery.Length >= pattern.Length) { - + bestMatch = pattern; - + } } - // extra kicker to remove the default XMLRPC login case.. just in case.. + // extra kicker to remove the default XMLRPC login case.. just in case.. if (path == "/") return false; if (String.IsNullOrEmpty(bestMatch)) { - + return false; } else { - + return true; } } @@ -588,7 +588,7 @@ namespace OpenSim.Framework.Servers { llsdHandler = null; // Pull out the first part of the path - // splitting the path by '/' means we'll get the following return.. + // splitting the path by '/' means we'll get the following return.. // {0}/{1}/{2} // where {0} isn't something we really control 100% @@ -599,7 +599,7 @@ namespace OpenSim.Framework.Servers return false; for (int i=1; i /// Get a report about the registered threads in this server. /// protected string GetThreadsReport() { StringBuilder sb = new StringBuilder(); - + List threads = ThreadTracker.GetThreads(); if (threads == null) { @@ -132,13 +132,13 @@ namespace OpenSim.Framework.Servers foreach (Thread t in threads) { sb.Append( - "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive + "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine); } - } - + } + return sb.ToString(); - } + } /// /// Return a report about the uptime of this server @@ -312,7 +312,7 @@ namespace OpenSim.Framework.Servers return; } - } + } /// /// Outputs to the console information about the region -- cgit v1.1