diff options
author | Melanie | 2010-06-25 20:26:48 +0100 |
---|---|---|
committer | Melanie | 2010-06-25 20:26:48 +0100 |
commit | dc9e9931eb6e1614d2a2a5f8c28941b5d6280103 (patch) | |
tree | 57a9714e264575c2b6045db07952495b81adeb6e /OpenSim/Framework/Servers/HttpServer | |
parent | Make "Allow other residents to edit terrain" default to FALSE (diff) | |
parent | fix web request exception reporting properly this time (diff) | |
download | opensim-SC-dc9e9931eb6e1614d2a2a5f8c28941b5d6280103.zip opensim-SC-dc9e9931eb6e1614d2a2a5f8c28941b5d6280103.tar.gz opensim-SC-dc9e9931eb6e1614d2a2a5f8c28941b5d6280103.tar.bz2 opensim-SC-dc9e9931eb6e1614d2a2a5f8c28941b5d6280103.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index a6e00c2..8123f2f 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -310,7 +310,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
310 | } | 310 | } |
311 | catch (Exception e) | 311 | catch (Exception e) |
312 | { | 312 | { |
313 | m_log.Error(string.Format("[BASE HTTP SERVER]: OnRequest() failed with "), e); | 313 | m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace); |
314 | } | 314 | } |
315 | } | 315 | } |
316 | 316 | ||