From a32bb9167597734fa0c977adbadfaaf56cd97c86 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 29 Nov 2007 06:07:48 +0000
Subject: * minor refactorings

---
 OpenSim/Region/Environment/Scenes/Scene.cs            | 12 ++++++------
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3309431..a52e636 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1007,7 +1007,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         protected ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
         {
-            ScenePresence newAvatar = null;
+            ScenePresence avatar = null;
 
             byte[] visualParams;
             AvatarWearable[] wearables;
@@ -1018,14 +1018,14 @@ namespace OpenSim.Region.Environment.Scenes
                 AvatarFactoryModule.GetDefaultAvatarAppearance(out wearables, out visualParams);
             }
 
-            newAvatar = m_innerScene.CreateAndAddScenePresence(client, child, wearables, visualParams);
+            avatar = m_innerScene.CreateAndAddScenePresence(client, child, wearables, visualParams);
 
-            if (newAvatar.IsChildAgent)
+            if (avatar.IsChildAgent)
             {
-                newAvatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement;
+                avatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement;
             }
 
-            return newAvatar;
+            return avatar;
         }
 
 
@@ -1044,7 +1044,7 @@ namespace OpenSim.Region.Environment.Scenes
                     {
                         client.SendKillObject(avatar.RegionHandle, avatar.LocalId); 
                     }
-                    catch (System.NullReferenceException NE)
+                    catch (System.NullReferenceException)
                     {
                         //We can safely ignore null reference exceptions.  It means the avatar are dead and cleaned up anyway.
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 45581c5..6a18587 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -496,7 +496,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// 
         /// </summary>
         /// <returns></returns>
-        public new SceneObjectGroup Copy(LLUUID cAgentID, LLUUID cGroupID)
+        public SceneObjectGroup Copy(LLUUID cAgentID, LLUUID cGroupID)
         {
             SceneObjectGroup dupe = (SceneObjectGroup) MemberwiseClone();
             dupe.m_parts = new Dictionary<LLUUID, SceneObjectPart>();
-- 
cgit v1.1