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/Framework | |
parent | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff) | |
download | opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.zip opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2 opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz |
Eliminated many warnings
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Animation.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/Console/MockConsole.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Tests/UtilTest.cs | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs index 3425505..e958b75 100644 --- a/OpenSim/Framework/Animation.cs +++ b/OpenSim/Framework/Animation.cs | |||
@@ -132,6 +132,11 @@ namespace OpenSim.Framework | |||
132 | return base.Equals(obj); | 132 | return base.Equals(obj); |
133 | } | 133 | } |
134 | 134 | ||
135 | public override int GetHashCode() | ||
136 | { | ||
137 | return base.GetHashCode(); | ||
138 | } | ||
139 | |||
135 | public override string ToString() | 140 | public override string ToString() |
136 | { | 141 | { |
137 | return "AnimID=" + AnimID.ToString() | 142 | return "AnimID=" + AnimID.ToString() |
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs index 8ba58e4..18a48bd 100644 --- a/OpenSim/Framework/Console/MockConsole.cs +++ b/OpenSim/Framework/Console/MockConsole.cs | |||
@@ -40,7 +40,9 @@ namespace OpenSim.Framework.Console | |||
40 | /// </summary> | 40 | /// </summary> |
41 | public class MockConsole : ICommandConsole | 41 | public class MockConsole : ICommandConsole |
42 | { | 42 | { |
43 | #pragma warning disable 0067 | ||
43 | public event OnOutputDelegate OnOutput; | 44 | public event OnOutputDelegate OnOutput; |
45 | #pragma warning restore 0067 | ||
44 | 46 | ||
45 | private MockCommands m_commands = new MockCommands(); | 47 | private MockCommands m_commands = new MockCommands(); |
46 | 48 | ||
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs index 3b7f252..960f5d8 100644 --- a/OpenSim/Framework/Tests/UtilTest.cs +++ b/OpenSim/Framework/Tests/UtilTest.cs | |||
@@ -299,7 +299,7 @@ namespace OpenSim.Framework.Tests | |||
299 | uint z1 = 22; | 299 | uint z1 = 22; |
300 | ulong regionHandle2; | 300 | ulong regionHandle2; |
301 | uint x2, y2, z2; | 301 | uint x2, y2, z2; |
302 | UUID fakeParcelID1, fakeParcelID2, uuid; | 302 | UUID fakeParcelID1, uuid; |
303 | 303 | ||
304 | ulong bigInt64 = Util.BytesToUInt64Big(hexBytes8); | 304 | ulong bigInt64 = Util.BytesToUInt64Big(hexBytes8); |
305 | Assert.AreEqual(var64Bit, bigInt64, | 305 | Assert.AreEqual(var64Bit, bigInt64, |