From da62344822524b74b431bf35e682aaf882c44da9 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 3 Feb 2010 15:40:59 +0000 Subject: [PATCH] minor: remove a couple of mono warnings --- OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 -- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 87c1a95197..298ede9da5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -44,8 +44,6 @@ namespace OpenSim.Region.Framework.Scenes { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - static System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); - private string m_inventoryFileName = String.Empty; private int m_inventoryFileNameSerial = 0; diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e26283dea0..bd59f2ec1c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2783,11 +2783,10 @@ namespace OpenSim.Region.Framework.Scenes { m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying); } - catch(Exception ex) + catch { m_scene.CrossAgentToNewRegion(this, false); } - } public void InTransit()