mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 10:15:33 +08:00
Update svn properties. Formatting cleanup.
This commit is contained in:
@@ -255,28 +255,28 @@ namespace OpenSim.Framework.Communications
|
||||
remote_client.SendNameReply(uuid, names[0], names[1]);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private string[] doUUIDNameRequest(LLUUID uuid)
|
||||
{
|
||||
string[] returnstring = new string[0];
|
||||
bool doLookup = false;
|
||||
|
||||
|
||||
|
||||
|
||||
lock (m_nameRequestCache)
|
||||
{
|
||||
if (m_nameRequestCache.ContainsKey(uuid))
|
||||
{
|
||||
returnstring = m_nameRequestCache[uuid];
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
// we don't want to lock the dictionary while we're doing the lookup
|
||||
doLookup = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (doLookup) {
|
||||
UserProfileData profileData = m_userService.GetUserProfile(uuid);
|
||||
if (profileData != null)
|
||||
@@ -293,7 +293,7 @@ namespace OpenSim.Framework.Communications
|
||||
}
|
||||
}
|
||||
return returnstring;
|
||||
|
||||
|
||||
}
|
||||
|
||||
public bool UUIDNameCachedTest(LLUUID uuid)
|
||||
@@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications
|
||||
string lastname = names[1];
|
||||
|
||||
return firstname + " " + lastname;
|
||||
|
||||
|
||||
}
|
||||
return "(hippos)";
|
||||
}
|
||||
|
||||
@@ -84,7 +84,8 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
string handlerKey = GetHandlerKey(httpMethod, path);
|
||||
|
||||
lock(m_streamHandlers) {
|
||||
lock (m_streamHandlers)
|
||||
{
|
||||
if (!m_streamHandlers.ContainsKey(handlerKey))
|
||||
{
|
||||
//m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey);
|
||||
@@ -100,7 +101,8 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
|
||||
{
|
||||
lock(m_rpcHandlers) {
|
||||
lock (m_rpcHandlers)
|
||||
{
|
||||
if (!m_rpcHandlers.ContainsKey(method))
|
||||
{
|
||||
m_rpcHandlers.Add(method, handler);
|
||||
@@ -114,7 +116,8 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
public bool AddHTTPHandler(string method, GenericHTTPMethod handler)
|
||||
{
|
||||
lock(m_HTTPHandlers) {
|
||||
lock (m_HTTPHandlers)
|
||||
{
|
||||
if (!m_HTTPHandlers.ContainsKey(method))
|
||||
{
|
||||
m_HTTPHandlers.Add(method, handler);
|
||||
@@ -132,7 +135,8 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
|
||||
{
|
||||
lock(m_agentHandlers) {
|
||||
lock (m_agentHandlers)
|
||||
{
|
||||
if (!m_agentHandlers.ContainsKey(agent))
|
||||
{
|
||||
m_agentHandlers.Add(agent, handler);
|
||||
@@ -171,7 +175,8 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
if (TryGetAgentHandler(request, response, out agentHandler))
|
||||
{
|
||||
if (HandleAgentRequest(agentHandler, request, response)) {
|
||||
if (HandleAgentRequest(agentHandler, request, response))
|
||||
{
|
||||
m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers
|
||||
public static OSHttpRequestPump[] Pumps(OSHttpServer server, int poolSize)
|
||||
{
|
||||
OSHttpRequestPump[] pumps = new OSHttpRequestPump[poolSize];
|
||||
for(int i = 0; i < pumps.Length; i++)
|
||||
for (int i = 0; i < pumps.Length; i++)
|
||||
{
|
||||
pumps[i]._httpServer = server;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
// thread identifier
|
||||
protected string _engineId;
|
||||
public string EngineID
|
||||
public string EngineID
|
||||
{
|
||||
get { return _engineId; }
|
||||
}
|
||||
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Servers
|
||||
/// <summary>
|
||||
/// Instantiate an HTTPS server.
|
||||
/// </summary>
|
||||
public OSHttpServer(IPAddress address, int port, X509Certificate certificate, int poolSize) :
|
||||
public OSHttpServer(IPAddress address, int port, X509Certificate certificate, int poolSize) :
|
||||
this(address, port, poolSize)
|
||||
{
|
||||
_engineId = String.Format("OSHttpServer [HTTPS:{0}/ps:{1}]", port, poolSize);
|
||||
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Servers
|
||||
/// <summary>
|
||||
/// Start the HTTP server engine.
|
||||
/// </summary>
|
||||
public void Start()
|
||||
public void Start()
|
||||
{
|
||||
_engine = new Thread(new ThreadStart(Engine));
|
||||
_engine.Name = _engineId;
|
||||
@@ -107,13 +107,13 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
private void Engine()
|
||||
private void Engine()
|
||||
{
|
||||
while (true)
|
||||
while (true)
|
||||
{
|
||||
// do stuff
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user