diff options
author | Justin Clark-Casey (justincc) | 2011-08-18 01:11:23 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-18 01:11:23 +0100 |
commit | 45c37ef494df3e6303a2c0346cb239731d448bed (patch) | |
tree | 77638db14c0daa2f2f1e84a6765874e08a066828 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Don't try to save changed attachment states when an NPC with attachments is r... (diff) | |
download | opensim-SC_OLD-45c37ef494df3e6303a2c0346cb239731d448bed.zip opensim-SC_OLD-45c37ef494df3e6303a2c0346cb239731d448bed.tar.gz opensim-SC_OLD-45c37ef494df3e6303a2c0346cb239731d448bed.tar.bz2 opensim-SC_OLD-45c37ef494df3e6303a2c0346cb239731d448bed.tar.xz |
refactor: Fold 3 ScenePresence() constructors into one since only one is called.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 |
1 files changed, 2 insertions, 9 deletions
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 | |||
713 | 713 | ||
714 | #region Constructor(s) | 714 | #region Constructor(s) |
715 | 715 | ||
716 | public ScenePresence() | 716 | public ScenePresence( |
717 | IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance, PresenceType type) | ||
717 | { | 718 | { |
718 | m_sendCourseLocationsMethod = SendCoarseLocationsDefault; | 719 | m_sendCourseLocationsMethod = SendCoarseLocationsDefault; |
719 | CreateSceneViewer(); | 720 | CreateSceneViewer(); |
720 | m_animator = new ScenePresenceAnimator(this); | 721 | m_animator = new ScenePresenceAnimator(this); |
721 | } | ||
722 | |||
723 | private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, PresenceType type) : this() | ||
724 | { | ||
725 | PresenceType = type; | 722 | PresenceType = type; |
726 | m_DrawDistance = world.DefaultDrawDistance; | 723 | m_DrawDistance = world.DefaultDrawDistance; |
727 | m_rootRegionHandle = reginfo.RegionHandle; | 724 | m_rootRegionHandle = reginfo.RegionHandle; |
@@ -768,11 +765,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
768 | 765 | ||
769 | RegisterToEvents(); | 766 | RegisterToEvents(); |
770 | SetDirectionVectors(); | 767 | SetDirectionVectors(); |
771 | } | ||
772 | 768 | ||
773 | public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance, PresenceType type) | ||
774 | : this(client, world, reginfo, type) | ||
775 | { | ||
776 | m_appearance = appearance; | 769 | m_appearance = appearance; |
777 | } | 770 | } |
778 | 771 | ||