diff options
| author | Melanie | 2011-01-23 23:29:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-23 23:29:25 +0000 |
| commit | 105deab601244584d779e8b7d1e8275b8aeb15ec (patch) | |
| tree | 63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Framework/Servers/HttpServer | |
| parent | Completely nixing flags from the client causes wearables to break. Fix it (diff) | |
| parent | Fixes mantis #5343 (diff) | |
| download | opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.zip opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2 opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 86ad7aa..d4ee7ba 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -587,8 +587,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 587 | // Every month or so this will wrap and give bad numbers, not really a problem | 587 | // Every month or so this will wrap and give bad numbers, not really a problem |
| 588 | // since its just for reporting, 200ms limit can be adjusted | 588 | // since its just for reporting, 200ms limit can be adjusted |
| 589 | int tickdiff = Environment.TickCount - tickstart; | 589 | int tickdiff = Environment.TickCount - tickstart; |
| 590 | if (tickdiff > 200) | 590 | if (tickdiff > 500) |
| 591 | m_log.InfoFormat("[BASE HTTP SERVER]: slow request <{0}> for {1} took {2} ms",reqnum,request.RawUrl,tickdiff); | 591 | m_log.InfoFormat( |
| 592 | "[BASE HTTP SERVER]: slow request <{0}> for {1} took {2} ms", reqnum, request.RawUrl, tickdiff); | ||
| 592 | } | 593 | } |
| 593 | } | 594 | } |
| 594 | 595 | ||