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

OpenSim/Framework/IScene.cs

@@ -33,15 +33,12 @@ namespace OpenSim.Framework
 {
     public delegate void restart(RegionInfo thisRegion);
 
-    //public delegate void regionup (RegionInfo thisRegion);
-
     public enum RegionStatus : int
     {
         Down = 0,
         Up = 1,
         Crashed = 2,
         Starting = 3,
-        SlaveScene = 4
     };
             
     /// <value>

OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

@@ -929,8 +929,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             UUID sessionID = useCircuitCode.CircuitCode.SessionID;
             uint circuitCode = useCircuitCode.CircuitCode.Code;
 
-            if (m_scene.RegionStatus != RegionStatus.SlaveScene)
-            {
             AuthenticateResponse sessionInfo;
             if (IsClientAuthorized(useCircuitCode, out sessionInfo))
             {
@@ -944,12 +942,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     useCircuitCode.CircuitCode.ID, useCircuitCode.CircuitCode.Code, remoteEndPoint);
             }
         }
-            else
-            {
-                // Slave regions don't accept new clients
-                m_log.Debug("[LLUDPSERVER]: Slave region " + m_scene.RegionInfo.RegionName + " ignoring UseCircuitCode packet");
-            }
-        }
 
         protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo)
         {

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 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 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";
                 }

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -1278,8 +1278,6 @@ namespace OpenSim.Region.Framework.Scenes
                     tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpTempOnRezMS);
                 }
 
-                if (RegionStatus != RegionStatus.SlaveScene)
-                {
                 if (Frame % m_update_events == 0)
                 {
                     int evMS = Util.EnvironmentTickCount();
@@ -1326,7 +1324,6 @@ namespace OpenSim.Region.Framework.Scenes
                 StatsReporter.addOtherMS(otherMS);
                 StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount());
                 StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
-                }
 
                 if (LoginsDisabled && Frame == 20)
                 {

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -1912,15 +1912,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 face = 0;
             }
+
             if (face >= 0 && face < GetNumberOfSides(part))
             {
                 Primitive.TextureEntryFace texface;
                 texface = tex.GetFace((uint)face);
-                return texface.TextureID.ToString();
+                string texture = texface.TextureID.ToString();
+
+                lock (part.TaskInventory)
+                {
+                    foreach (KeyValuePair<UUID, TaskInventoryItem> inv in part.TaskInventory)
+                    {
+                        if (inv.Value.AssetID == texface.TextureID)
+                        {
+                            texture = inv.Value.Name.ToString();
+                            break;
+                        }
+                    }
+                }
+
+                return texture;
             }
             else
             {
-                return String.Empty;
+                return UUID.Zero.ToString();
             }
         }
 
@@ -4224,8 +4239,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llCollisionSound(string impact_sound, double impact_volume)
         {
-
             m_host.AddScriptLPS(1);
+            
             // TODO: Parameter check logic required.
             UUID soundId = UUID.Zero;
             if (!UUID.TryParse(impact_sound, out soundId))