Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2026-08-08 02:05:34 +08:00 · 2011-11-28 11:06:38 +00:00
parent a8270cb48c 19c10c892a
commit dc612d0f08
31 changed files with 706 additions and 455 deletions
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -295,7 +295,7 @@ namespace OpenSim.Framework
                    return result;
                }
            }
-            catch (Exception e)
+            catch
            {
                // don't need to treat this as an error... we're just guessing anyway
 //                m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message);