5 files changed, 6 insertions, 9 deletions

diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index d5edc6d..a78e4f6 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Modules
                 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
                 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
             }
-            catch (Exception e)
+            catch (Exception)
             {
             }
 
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Environment.Modules
                     m_enabled = true;
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 Console.WriteLine("No IRC config information, skipping IRC bridge configuration");
             }
diff --git a/OpenSim/Region/Environment/Modules/SunModule.cs b/OpenSim/Region/Environment/Modules/SunModule.cs
index 3598798..c941b1e 100644
--- a/OpenSim/Region/Environment/Modules/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/SunModule.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules
             try {
                 m_day_length = config.Configs["Sun"].GetDouble("day_length", 0.5);
                 m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", 100);
-            } catch (Exception e) {
+            } catch (Exception) {
                 m_day_length = 0.5;
                 m_frame_mod = 100;
             }
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 434c92f..1223f5c 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Modules
                 }
             }
 
-            if ((channel == null) || (channel.Equals(LLUUID.Zero)))
+            if ((channel.Equals(null)) || (channel.Equals(LLUUID.Zero)))
             {
                 channel = LLUUID.Random();
                 RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 18fe785..76fe4b6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -841,7 +841,7 @@ namespace OpenSim.Region.Environment.Scenes
                 IsPhantom = (data[i++] != 0) ? true : false;
                 CastsShadows = (data[i++] != 0) ? true : false;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 Console.WriteLine("Ignoring invalid Packet:");
                 //Silently ignore it - TODO: FIXME Quick
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b6daad6..38523e0 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -439,7 +439,6 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void StopMovement()
         {
-            int x = 0;
         }
 
         public void AddNeighbourRegion(ulong regionHandle)
@@ -624,8 +623,6 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 pos = part.AbsolutePosition + offset;
 
-                double dist = AbsolutePosition.GetDistanceTo(pos);
-
                 if (m_physicsActor != null)
                 {
                     m_sitAvatarHeight = m_physicsActor.Size.Z;
@@ -633,7 +630,7 @@ namespace OpenSim.Region.Environment.Scenes
 
 // this doesn't seem to quite work yet....
 //                 // if we're close, set the avatar position to the target position and forgo autopilot
-//                 if (dist < 2.5)
+//                 if (AbsolutePosition.GetDistanceTo(pos) < 2.5)
 //                 {
 //                     autopilot = false;
 //                     AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight);