diff options
| author | Justin Clark-Casey (justincc) | 2012-09-24 22:52:33 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-09-24 22:52:33 +0100 |
| commit | ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f (patch) | |
| tree | f0fca1b7c047760a0927441840e7709ff91e7fb5 /OpenSim/Framework | |
| parent | Documenting LSL script-related events (diff) | |
| parent | HG Rez object: warn the user if the item or asset cannot be found. (diff) | |
| download | opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.zip opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.gz opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.bz2 opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -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 8c29ad4..d139235 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -636,11 +636,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 636 | } | 636 | } |
| 637 | catch (IOException e) | 637 | catch (IOException e) |
| 638 | { | 638 | { |
| 639 | m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e); | 639 | m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.StackTrace), e); |
| 640 | } | 640 | } |
| 641 | catch (Exception e) | 641 | catch (Exception e) |
| 642 | { | 642 | { |
| 643 | m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e); | 643 | m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.StackTrace), e); |
| 644 | SendHTML500(response); | 644 | SendHTML500(response); |
| 645 | } | 645 | } |
| 646 | finally | 646 | finally |