diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 3309431cb3..a52e636df3 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 45581c56bb..6a18587869 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -496,7 +496,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// - public new SceneObjectGroup Copy(LLUUID cAgentID, LLUUID cGroupID) + public SceneObjectGroup Copy(LLUUID cAgentID, LLUUID cGroupID) { SceneObjectGroup dupe = (SceneObjectGroup) MemberwiseClone(); dupe.m_parts = new Dictionary();