diff options
author | John Hurliman | 2009-10-20 10:56:15 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-20 10:56:15 -0700 |
commit | 8151190a45b98645efb06ea28b1758ffbc75cf7e (patch) | |
tree | 86413fe5a407a6ce24337a23148c7eb816eed792 /OpenSim/Region | |
parent | * Removing cruft left over from the conversion to the new texture sending and... (diff) | |
download | opensim-SC_OLD-8151190a45b98645efb06ea28b1758ffbc75cf7e.zip opensim-SC_OLD-8151190a45b98645efb06ea28b1758ffbc75cf7e.tar.gz opensim-SC_OLD-8151190a45b98645efb06ea28b1758ffbc75cf7e.tar.bz2 opensim-SC_OLD-8151190a45b98645efb06ea28b1758ffbc75cf7e.tar.xz |
* Removing ODEPrim and ODECharacter GetHashCode() overrides since they were based on something that could change
* Tweaked a few other GetHashCode() overrides to bring them in line with MSDN recommendations
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index ef0e56e..71ace16 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -231,11 +231,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
231 | set { m_localID = value; } | 231 | set { m_localID = value; } |
232 | } | 232 | } |
233 | 233 | ||
234 | public override int GetHashCode() | ||
235 | { | ||
236 | return (int)m_localID; | ||
237 | } | ||
238 | |||
239 | public override bool Grabbed | 234 | public override bool Grabbed |
240 | { | 235 | { |
241 | set { return; } | 236 | set { return; } |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 63bfc90..4581d22 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -259,11 +259,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
259 | m_localID = value; } | 259 | m_localID = value; } |
260 | } | 260 | } |
261 | 261 | ||
262 | public override int GetHashCode() | ||
263 | { | ||
264 | return (int)m_localID; | ||
265 | } | ||
266 | |||
267 | public override bool Grabbed | 262 | public override bool Grabbed |
268 | { | 263 | { |
269 | set { return; } | 264 | set { return; } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 2842f6b..3f38bb6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -1975,7 +1975,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1975 | 1975 | ||
1976 | public override int GetHashCode() | 1976 | public override int GetHashCode() |
1977 | { | 1977 | { |
1978 | return Convert.ToInt32(value); | 1978 | return value.GetHashCode(); |
1979 | } | 1979 | } |
1980 | 1980 | ||
1981 | 1981 | ||