diff options
author | Oren Hurvitz | 2014-04-22 20:04:12 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 16:37:36 +0300 |
commit | 998d7009a65def0a4debc9369d35b63611db5b55 (patch) | |
tree | d1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Region/Framework/Scenes | |
parent | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff) | |
download | opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2 opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz |
Eliminated many warnings
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
5 files changed, 12 insertions, 2 deletions
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 | |||
306 | return base.Equals(obj); | 306 | return base.Equals(obj); |
307 | } | 307 | } |
308 | 308 | ||
309 | public override int GetHashCode() | ||
310 | { | ||
311 | return base.GetHashCode(); | ||
312 | } | ||
313 | |||
309 | public override string ToString() | 314 | public override string ToString() |
310 | { | 315 | { |
311 | StringBuilder buff = new StringBuilder(); | 316 | 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 | |||
43 | public abstract class SceneBase : IScene | 43 | public abstract class SceneBase : IScene |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | |||
47 | #pragma warning disable 414 | ||
46 | private static readonly string LogHeader = "[SCENE]"; | 48 | private static readonly string LogHeader = "[SCENE]"; |
49 | #pragma warning restore 414 | ||
47 | 50 | ||
48 | #region Events | 51 | #region Events |
49 | 52 | ||
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 | |||
271 | //private int m_moveToPositionStateStatus; | 271 | //private int m_moveToPositionStateStatus; |
272 | //***************************************************** | 272 | //***************************************************** |
273 | 273 | ||
274 | private bool m_collisionEventFlag = false; | ||
275 | private object m_collisionEventLock = new Object(); | 274 | private object m_collisionEventLock = new Object(); |
276 | 275 | ||
277 | private int m_movementAnimationUpdateCounter = 0; | 276 | 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 | |||
46 | public static class OpenSimTerrainCompressor | 46 | public static class OpenSimTerrainCompressor |
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | |||
50 | #pragma warning disable 414 | ||
49 | private static string LogHeader = "[TERRAIN COMPRESSOR]"; | 51 | private static string LogHeader = "[TERRAIN COMPRESSOR]"; |
52 | #pragma warning restore 414 | ||
50 | 53 | ||
51 | public const int END_OF_PATCHES = 97; | 54 | public const int END_OF_PATCHES = 97; |
52 | 55 | ||
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 | |||
192 | if (ps.Texture != UUID.Zero) | 192 | if (ps.Texture != UUID.Zero) |
193 | assetUuids[ps.Texture] = (sbyte)AssetType.Texture; | 193 | assetUuids[ps.Texture] = (sbyte)AssetType.Texture; |
194 | } | 194 | } |
195 | catch (Exception e) | 195 | catch (Exception) |
196 | { | 196 | { |
197 | m_log.WarnFormat( | 197 | m_log.WarnFormat( |
198 | "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt. Continuing.", | 198 | "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt. Continuing.", |