aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMic Bowman2011-04-21 08:23:01 -0700
committerMic Bowman2011-04-21 08:23:01 -0700
commit371576d1dd9fb49f9e366b0fac44ab73381b3baa (patch)
treeaf61ce33dc45340ea1f99066eee64950014994ee /OpenSim/Framework
parentAdded ability to remove unacked packet from UnackedPacketCollection without a... (diff)
parentfix meshing failure on sculpt maps smaller than 64x64 (diff)
downloadopensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.zip
opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.gz
opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.bz2
opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.xz
Merge branch 'master' into queuetest
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ccec9b7..ba89e21 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -430,7 +430,7 @@ namespace OpenSim.Framework.Servers.HttpServer
430 string path = request.RawUrl; 430 string path = request.RawUrl;
431 string handlerKey = GetHandlerKey(request.HttpMethod, path); 431 string handlerKey = GetHandlerKey(request.HttpMethod, path);
432 432
433 //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); 433// m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path);
434 434
435 if (TryGetStreamHandler(handlerKey, out requestHandler)) 435 if (TryGetStreamHandler(handlerKey, out requestHandler))
436 { 436 {