* 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

4 files changed, 2 insertions, 12 deletions

diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index 62ab5c7..9504e03 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Framework
 
         public override int GetHashCode()
         {
-            return X.GetHashCode() * 29 + Y.GetHashCode();
+            return X.GetHashCode() ^ Y.GetHashCode();
         }
 
         public object Clone()
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
             set { m_localID = value; }
         }
 
-        public override int GetHashCode()
-        {
-            return (int)m_localID;
-        }
-
         public override bool Grabbed
         {
             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
                 m_localID = value; }
         }
 
-        public override int GetHashCode()
-        {
-            return (int)m_localID;
-        }
-
         public override bool Grabbed
         {
             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
 
             public override int GetHashCode()
             {
-                return Convert.ToInt32(value);
+                return value.GetHashCode();
             }