From 45c37ef494df3e6303a2c0346cb239731d448bed Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 18 Aug 2011 01:11:23 +0100
Subject: refactor: Fold 3 ScenePresence() constructors into one since only one
 is called.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e3bd393..564a456 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -713,15 +713,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Constructor(s)
         
-        public ScenePresence()
+        public ScenePresence(
+            IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance, PresenceType type)
         {
             m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
             CreateSceneViewer();
             m_animator = new ScenePresenceAnimator(this);
-        }
-        
-        private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, PresenceType type) : this()
-        {
             PresenceType = type;
             m_DrawDistance = world.DefaultDrawDistance;
             m_rootRegionHandle = reginfo.RegionHandle;
@@ -768,11 +765,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             RegisterToEvents();
             SetDirectionVectors();
-        }
 
-        public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance, PresenceType type)
-            : this(client, world, reginfo, type)
-        {
             m_appearance = appearance;
         }
 
-- 
cgit v1.1