aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-11 18:02:22 +0000
committerJustin Clarke Casey2009-03-11 18:02:22 +0000
commitacad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch)
tree2379c1ae60c22a4dcee162c5b56d21f367c05bfd /OpenSim/Framework/Servers
parent* Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff)
downloadopensim-SC-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.zip
opensim-SC-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.gz
opensim-SC-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.bz2
opensim-SC-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.xz
* Make all coded defaults match settings in OpenSim.ini.example
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 16bfbd8..5bd0fa5 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -115,7 +115,6 @@ namespace OpenSim.Framework.Servers
115 { 115 {
116 string httpMethod = handler.HttpMethod; 116 string httpMethod = handler.HttpMethod;
117 string path = handler.Path; 117 string path = handler.Path;
118
119 string handlerKey = GetHandlerKey(httpMethod, path); 118 string handlerKey = GetHandlerKey(httpMethod, path);
120 119
121 lock (m_streamHandlers) 120 lock (m_streamHandlers)
@@ -187,7 +186,6 @@ namespace OpenSim.Framework.Servers
187 // Note that the agent string is provided simply to differentiate 186 // Note that the agent string is provided simply to differentiate
188 // the handlers - it is NOT required to be an actual agent header 187 // the handlers - it is NOT required to be an actual agent header
189 // value. 188 // value.
190
191 public bool AddAgentHandler(string agent, IHttpAgentHandler handler) 189 public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
192 { 190 {
193 lock (m_agentHandlers) 191 lock (m_agentHandlers)