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/WebUtil.cs | |
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 'OpenSim/Framework/WebUtil.cs')
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index d88d095..d731ac5 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Framework | |||
58 | 58 | ||
59 | // number of milliseconds a call can take before it is considered | 59 | // number of milliseconds a call can take before it is considered |
60 | // a "long" call for warning & debugging purposes | 60 | // a "long" call for warning & debugging purposes |
61 | public const int LongCallTime = 200; | 61 | public const int LongCallTime = 500; |
62 | 62 | ||
63 | /// <summary> | 63 | /// <summary> |
64 | /// Send LLSD to an HTTP client in application/llsd+json form | 64 | /// Send LLSD to an HTTP client in application/llsd+json form |