From 998d7009a65def0a4debc9369d35b63611db5b55 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 22 Apr 2014 20:04:12 +0300
Subject: Eliminated many warnings

---
 OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 5 +++++
 OpenSim/Region/Framework/Scenes/SceneBase.cs              | 3 +++
 OpenSim/Region/Framework/Scenes/ScenePresence.cs          | 1 -
 OpenSim/Region/Framework/Scenes/TerrainCompressor.cs      | 3 +++
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs           | 2 +-
 5 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index b7400ea..eb1a970 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -306,6 +306,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             return base.Equals(obj);
         }
 
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
         public override string ToString()
         {
             StringBuilder buff = new StringBuilder();
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index b059ecf..4208669 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -43,7 +43,10 @@ namespace OpenSim.Region.Framework.Scenes
     public abstract class SceneBase : IScene
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+#pragma warning disable 414
         private static readonly string LogHeader = "[SCENE]";
+#pragma warning restore 414
 
         #region Events
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 57f9d01..e722fa5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -271,7 +271,6 @@ namespace OpenSim.Region.Framework.Scenes
         //private int m_moveToPositionStateStatus;
         //*****************************************************
 
-        private bool m_collisionEventFlag = false;
         private object m_collisionEventLock = new Object();
 
         private int m_movementAnimationUpdateCounter = 0;
diff --git a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
index 1107a2a..e797207 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
@@ -46,7 +46,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     public static class OpenSimTerrainCompressor
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+#pragma warning disable 414
         private static string LogHeader = "[TERRAIN COMPRESSOR]";
+#pragma warning restore 414
 
         public const int END_OF_PATCHES = 97;
 
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index fe6cb84..a7015e1 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (ps.Texture != UUID.Zero)
                                 assetUuids[ps.Texture] = (sbyte)AssetType.Texture;
                         }
-                        catch (Exception e)
+                        catch (Exception)
                         {
                             m_log.WarnFormat(
                                 "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt.  Continuing.", 
-- 
cgit v1.1