diff options
| author | Melanie | 2011-11-19 22:39:15 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-19 22:39:15 +0000 |
| commit | bdb5ac96d9432eb568ed3e3bb46b012365f884bc (patch) | |
| tree | fe2ce2636be7e750b3f235a6c04b9f3a5cf2f8af /OpenSim/Framework | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre... (diff) | |
| download | opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.zip opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.gz opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.bz2 opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Framework')
| -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 60c1e15..6ce122b 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
| @@ -298,7 +298,7 @@ namespace OpenSim.Framework | |||
| 298 | catch (Exception e) | 298 | catch (Exception e) |
| 299 | { | 299 | { |
| 300 | // don't need to treat this as an error... we're just guessing anyway | 300 | // don't need to treat this as an error... we're just guessing anyway |
| 301 | m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message); | 301 | // m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message); |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | return result; | 304 | return result; |