diff options
| author | Melanie | 2011-11-28 11:06:38 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-28 11:06:38 +0000 |
| commit | dc612d0f08ff8740c1942270f22eb79f0310c8fd (patch) | |
| tree | 4c621d499eecbc176c6eb28a4bad4f8f4872e7f5 /OpenSim/Framework/WebUtil.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.zip opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.gz opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.bz2 opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
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 6ce122b..854f310 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
| @@ -295,7 +295,7 @@ namespace OpenSim.Framework | |||
| 295 | return result; | 295 | return result; |
| 296 | } | 296 | } |
| 297 | } | 297 | } |
| 298 | catch (Exception e) | 298 | catch |
| 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); |