diff options
author | Justin Clark-Casey (justincc) | 2011-09-12 22:54:54 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-12 22:54:54 +0100 |
commit | 62b24505295a49b3b3ba61a1a840d0fa5825340f (patch) | |
tree | f9820d33f5fadccb663a17fccec53c15f16a9ab9 /OpenSim/Region/Framework/Scenes | |
parent | stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is... (diff) | |
download | opensim-SC_OLD-62b24505295a49b3b3ba61a1a840d0fa5825340f.zip opensim-SC_OLD-62b24505295a49b3b3ba61a1a840d0fa5825340f.tar.gz opensim-SC_OLD-62b24505295a49b3b3ba61a1a840d0fa5825340f.tar.bz2 opensim-SC_OLD-62b24505295a49b3b3ba61a1a840d0fa5825340f.tar.xz |
remove the unused SP.initializeScenePresence()
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9b8afe3..1050507 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3568,29 +3568,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3568 | } | 3568 | } |
3569 | } | 3569 | } |
3570 | 3570 | ||
3571 | |||
3572 | public void initializeScenePresence(IClientAPI client, RegionInfo region, Scene scene) | ||
3573 | { | ||
3574 | m_controllingClient = client; | ||
3575 | m_regionInfo = region; | ||
3576 | m_scene = scene; | ||
3577 | |||
3578 | RegisterToEvents(); | ||
3579 | |||
3580 | /* | ||
3581 | AbsolutePosition = client.StartPos; | ||
3582 | |||
3583 | Animations = new AvatarAnimations(); | ||
3584 | Animations.LoadAnims(); | ||
3585 | |||
3586 | m_animations = new List<UUID>(); | ||
3587 | m_animations.Add(Animations.AnimsUUID["STAND"]); | ||
3588 | m_animationSeqs.Add(m_controllingClient.NextAnimationSequenceNumber); | ||
3589 | |||
3590 | SetDirectionVectors(); | ||
3591 | */ | ||
3592 | } | ||
3593 | |||
3594 | internal void PushForce(Vector3 impulse) | 3571 | internal void PushForce(Vector3 impulse) |
3595 | { | 3572 | { |
3596 | if (PhysicsActor != null) | 3573 | if (PhysicsActor != null) |
@@ -3618,6 +3595,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3618 | obj.ignoreControls = (ScriptControlled)controls; | 3595 | obj.ignoreControls = (ScriptControlled)controls; |
3619 | obj.eventControls = (ScriptControlled)controls; | 3596 | obj.eventControls = (ScriptControlled)controls; |
3620 | } | 3597 | } |
3598 | |||
3621 | if (pass_on == 1 && accept == 1) | 3599 | if (pass_on == 1 && accept == 1) |
3622 | { | 3600 | { |
3623 | IgnoredControls = ScriptControlled.CONTROL_ZERO; | 3601 | IgnoredControls = ScriptControlled.CONTROL_ZERO; |
@@ -3638,6 +3616,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3638 | scriptedcontrols[Script_item_UUID] = obj; | 3616 | scriptedcontrols[Script_item_UUID] = obj; |
3639 | } | 3617 | } |
3640 | } | 3618 | } |
3619 | |||
3641 | ControllingClient.SendTakeControls(controls, pass_on == 1 ? true : false, true); | 3620 | ControllingClient.SendTakeControls(controls, pass_on == 1 ? true : false, true); |
3642 | } | 3621 | } |
3643 | 3622 | ||