diff options
| author | Justin Clark-Casey (justincc) | 2012-04-06 20:29:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-04-06 20:29:54 +0100 |
| commit | 908cebbea8d7e685223b22ef8216971daccbdd53 (patch) | |
| tree | 9827cf434e8013a4618bb278857d68373054f882 /OpenSim/Framework/Servers | |
| parent | remove possible PhysActor unexpectedly null race conditions when changing pri... (diff) | |
| parent | Deleted the unused and commented code from 2 commits ago. (diff) | |
| download | opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.zip opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.gz opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.bz2 opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index a8ece79..9d8561b 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -662,11 +662,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 662 | } | 662 | } |
| 663 | catch (IOException e) | 663 | catch (IOException e) |
| 664 | { | 664 | { |
| 665 | m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw ", e); | 665 | m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e); |
| 666 | } | 666 | } |
| 667 | catch (Exception e) | 667 | catch (Exception e) |
| 668 | { | 668 | { |
| 669 | m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw " + e.ToString()); | 669 | m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e.StackTrace); |
| 670 | SendHTML500(response); | 670 | SendHTML500(response); |
| 671 | } | 671 | } |
| 672 | finally | 672 | finally |