aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-18 01:22:01 +0100
committerJustin Clark-Casey (justincc)2011-08-18 01:22:01 +0100
commit49258350e8e34ce36bce08a2f40b8824d67449ab (patch)
tree625e23dab204c96a97c3a80e23c5897366c08b6f /OpenSim/Region/Framework
parentminor: remove some mono compiler warnings (diff)
downloadopensim-SC-49258350e8e34ce36bce08a2f40b8824d67449ab.zip
opensim-SC-49258350e8e34ce36bce08a2f40b8824d67449ab.tar.gz
opensim-SC-49258350e8e34ce36bce08a2f40b8824d67449ab.tar.bz2
opensim-SC-49258350e8e34ce36bce08a2f40b8824d67449ab.tar.xz
refactor: fold CreateSceneViewer() back into ScenePresence constructor
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 564a456..719f2da 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -717,7 +717,7 @@ namespace OpenSim.Region.Framework.Scenes
717 IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance, PresenceType type) 717 IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance, PresenceType type)
718 { 718 {
719 m_sendCourseLocationsMethod = SendCoarseLocationsDefault; 719 m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
720 CreateSceneViewer(); 720 m_sceneViewer = new SceneViewer(this);
721 m_animator = new ScenePresenceAnimator(this); 721 m_animator = new ScenePresenceAnimator(this);
722 PresenceType = type; 722 PresenceType = type;
723 m_DrawDistance = world.DefaultDrawDistance; 723 m_DrawDistance = world.DefaultDrawDistance;
@@ -769,11 +769,6 @@ namespace OpenSim.Region.Framework.Scenes
769 m_appearance = appearance; 769 m_appearance = appearance;
770 } 770 }
771 771
772 private void CreateSceneViewer()
773 {
774 m_sceneViewer = new SceneViewer(this);
775 }
776
777 public void RegisterToEvents() 772 public void RegisterToEvents()
778 { 773 {
779 m_controllingClient.OnCompleteMovementToRegion += CompleteMovement; 774 m_controllingClient.OnCompleteMovementToRegion += CompleteMovement;