diff options
| author | Mic Bowman | 2011-04-18 11:29:43 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-18 11:29:43 -0700 |
| commit | 452ae375f0fdd62ba16fb170869ea470c6906cfe (patch) | |
| tree | b5a7d364e509f2ff7f1b9086e2ba5658f4ee99ac /OpenSim/Framework | |
| parent | Remove the call to remove tokens from the parent. Under heavy load (diff) | |
| parent | Mantis #5442: Add admin_save_heightmap (diff) | |
| download | opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.zip opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.gz opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.bz2 opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.xz | |
Merge branch 'master' into test-merge0418
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/WebUtil.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 64cd014..9d70f63 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
| @@ -222,8 +222,8 @@ namespace OpenSim.Framework | |||
| 222 | m_log.InfoFormat("[WEB UTIL]: osd request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing", | 222 | m_log.InfoFormat("[WEB UTIL]: osd request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing", |
| 223 | reqnum,url,method,tickdiff,tickdata); | 223 | reqnum,url,method,tickdiff,tickdata); |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | m_log.WarnFormat("[WEB UTIL] <{0}> osd request failed: {1}",reqnum,errorMessage); | 226 | m_log.WarnFormat("[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage); |
| 227 | return ErrorResponseMap(errorMessage); | 227 | return ErrorResponseMap(errorMessage); |
| 228 | } | 228 | } |
| 229 | 229 | ||