Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 48 insertions, 47 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index e07d8b4..e9e1845 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -174,8 +174,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             bool heldBack = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG;
             bool heldLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS;
             bool heldRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG;
-            //bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT;
-            //bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT;
+            bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT;
+            bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT;
             bool heldUp = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) == AgentManager.ControlFlags.AGENT_CONTROL_UP_POS;
             bool heldDown = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG;
             //bool flying = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) == AgentManager.ControlFlags.AGENT_CONTROL_FLY;
@@ -317,6 +317,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     // Not walking
                     if (move.Z < 0)
                         return "CROUCH";
+                    else if (heldTurnLeft)
+                        return "TURNLEFT";
+                    else if (heldTurnRight)
+                        return "TURNRIGHT";
                     else
                         return "STAND";
                 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0e5a7d2..29a54e8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1278,56 +1278,53 @@ namespace OpenSim.Region.Framework.Scenes
                     tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpTempOnRezMS);
                 }
 
-                if (RegionStatus != RegionStatus.SlaveScene)
+                if (Frame % m_update_events == 0)
                 {
-                    if (Frame % m_update_events == 0)
-                    {
-                        int evMS = Util.EnvironmentTickCount();
-                        UpdateEvents();
-                        eventMS = Util.EnvironmentTickCountSubtract(evMS); ;
-                    }
-
-                    if (Frame % m_update_backup == 0)
-                    {
-                        int backMS = Util.EnvironmentTickCount();
-                        UpdateStorageBackup();
-                        backupMS = Util.EnvironmentTickCountSubtract(backMS);
-                    }
-
-                    if (Frame % m_update_terrain == 0)
-                    {
-                        int terMS = Util.EnvironmentTickCount();
-                        UpdateTerrain();
-                        terrainMS = Util.EnvironmentTickCountSubtract(terMS);
-                    }
+                    int evMS = Util.EnvironmentTickCount();
+                    UpdateEvents();
+                    eventMS = Util.EnvironmentTickCountSubtract(evMS); ;
+                }
 
-                    //if (Frame % m_update_land == 0)
-                    //{
-                    //    int ldMS = Util.EnvironmentTickCount();
-                    //    UpdateLand();
-                    //    landMS = Util.EnvironmentTickCountSubtract(ldMS);
-                    //}
+                if (Frame % m_update_backup == 0)
+                {
+                    int backMS = Util.EnvironmentTickCount();
+                    UpdateStorageBackup();
+                    backupMS = Util.EnvironmentTickCountSubtract(backMS);
+                }
 
-                    frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS);
-                    otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
-                    lastCompletedFrame = Util.EnvironmentTickCount();
-
-                    // if (Frame%m_update_avatars == 0)
-                    //   UpdateInWorldTime();
-                    StatsReporter.AddPhysicsFPS(physicsFPS);
-                    StatsReporter.AddTimeDilation(TimeDilation);
-                    StatsReporter.AddFPS(1);
-                    StatsReporter.SetRootAgents(m_sceneGraph.GetRootAgentCount());
-                    StatsReporter.SetChildAgents(m_sceneGraph.GetChildAgentCount());
-                    StatsReporter.SetObjects(m_sceneGraph.GetTotalObjectsCount());
-                    StatsReporter.SetActiveObjects(m_sceneGraph.GetActiveObjectsCount());
-                    StatsReporter.addFrameMS(frameMS);
-                    StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
-                    StatsReporter.addOtherMS(otherMS);
-                    StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount());
-                    StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
+                if (Frame % m_update_terrain == 0)
+                {
+                    int terMS = Util.EnvironmentTickCount();
+                    UpdateTerrain();
+                    terrainMS = Util.EnvironmentTickCountSubtract(terMS);
                 }
 
+                //if (Frame % m_update_land == 0)
+                //{
+                //    int ldMS = Util.EnvironmentTickCount();
+                //    UpdateLand();
+                //    landMS = Util.EnvironmentTickCountSubtract(ldMS);
+                //}
+
+                frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS);
+                otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
+                lastCompletedFrame = Util.EnvironmentTickCount();
+
+                // if (Frame%m_update_avatars == 0)
+                //   UpdateInWorldTime();
+                StatsReporter.AddPhysicsFPS(physicsFPS);
+                StatsReporter.AddTimeDilation(TimeDilation);
+                StatsReporter.AddFPS(1);
+                StatsReporter.SetRootAgents(m_sceneGraph.GetRootAgentCount());
+                StatsReporter.SetChildAgents(m_sceneGraph.GetChildAgentCount());
+                StatsReporter.SetObjects(m_sceneGraph.GetTotalObjectsCount());
+                StatsReporter.SetActiveObjects(m_sceneGraph.GetActiveObjectsCount());
+                StatsReporter.addFrameMS(frameMS);
+                StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
+                StatsReporter.addOtherMS(otherMS);
+                StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount());
+                StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
+
                 if (LoginsDisabled && Frame == 20)
                 {
                     // In 99.9% of cases it is a bad idea to manually force garbage collection. However,