aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2017-06-03 07:20:31 +0100
committerUbitUmarov2017-06-03 07:20:31 +0100
commitaea282ba38718027fe928b65b0c7c0e8eafd18e7 (patch)
tree6137d6755d1e13892004119027472088d35bbba4 /OpenSim/Region
parentMerge branch 'master' into httptests (diff)
parentremove redundant UpdateMovementAnimations(); (diff)
downloadopensim-SC-aea282ba38718027fe928b65b0c7c0e8eafd18e7.zip
opensim-SC-aea282ba38718027fe928b65b0c7c0e8eafd18e7.tar.gz
opensim-SC-aea282ba38718027fe928b65b0c7c0e8eafd18e7.tar.bz2
opensim-SC-aea282ba38718027fe928b65b0c7c0e8eafd18e7.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ed9cf53..f86814d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2772,13 +2772,13 @@ namespace OpenSim.Region.Framework.Scenes
2772 } 2772 }
2773 } 2773 }
2774 } 2774 }
2775 2775/*
2776 if (update_movementflag && ParentID == 0 && m_delayedStop < 0) 2776 if (update_movementflag && ParentID == 0 && m_delayedStop < 0)
2777 { 2777 {
2778// m_log.DebugFormat("[SCENE PRESENCE]: Updating movement animations for {0}", Name); 2778// m_log.DebugFormat("[SCENE PRESENCE]: Updating movement animations for {0}", Name);
2779 Animator.UpdateMovementAnimations(); 2779 Animator.UpdateMovementAnimations();
2780 } 2780 }
2781 2781*/
2782 SendControlsToScripts(flagsForScripts); 2782 SendControlsToScripts(flagsForScripts);
2783 } 2783 }
2784 2784