Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs

2 files changed, 27 insertions, 34 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
index e951d9e..84211a9 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
@@ -161,12 +161,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations
             UUID defaultAnimId = anims.DefaultAnimation.AnimID;
             cdl.AddRow(
                 "Default anim", 
-                string.Format("{0}, {1}", defaultAnimId, GetAnimName(sp.Scene.AssetService, defaultAnimId)));
+                string.Format("{0}, {1}", defaultAnimId, sp.Animator.GetAnimName(defaultAnimId)));
 
             UUID implicitDefaultAnimId = anims.ImplicitDefaultAnimation.AnimID;
             cdl.AddRow(
                 "Implicit default anim", 
-                string.Format("{0}, {1}", implicitDefaultAnimId, GetAnimName(sp.Scene.AssetService, implicitDefaultAnimId)));
+                string.Format("{0}, {1}", 
+                    implicitDefaultAnimId, sp.Animator.GetAnimName(implicitDefaultAnimId)));
 
             cdl.AddToStringBuilder(sb);
 
@@ -185,7 +186,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations
             for (int i = 0; i < animIds.Length; i++)
             {
                 UUID animId = animIds[i];
-                string animName = GetAnimName(sp.Scene.AssetService, animId);
+                string animName = sp.Animator.GetAnimName(animId);
                 int seq = sequenceNumbers[i];
                 UUID objectId = objectIds[i];
 
@@ -195,21 +196,5 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations
             cdt.AddToStringBuilder(sb);
             sb.Append("\n");
         }
-
-        private string GetAnimName(IAssetService assetService, UUID animId)
-        {
-            string animName;
-
-            if (!DefaultAvatarAnimations.AnimsNames.TryGetValue(animId, out animName))
-            {
-                AssetMetadata amd = assetService.GetMetadata(animId.ToString());
-                if (amd != null)
-                    animName = amd.Name;
-                else
-                    animName = "Unknown";
-            }
-
-            return animName;
-        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index 8b8758e..12169ab 100644
--- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                 "debug scene get",
                 "List current scene options.",
                 "If active     is false then main scene update and maintenance loops are suspended.\n"
+                    + "If animations is true  then extra animations debug information is logged.\n"
                     + "If collisions is false then collisions with other objects are turned off.\n"
                     + "If pbackup    is false then periodic scene backup is turned off.\n"
                     + "If physics    is false then all physics objects are non-physical.\n"
@@ -107,6 +108,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                 "debug scene set active|collisions|pbackup|physics|scripting|teleport|updates true|false",
                 "Turn on scene debugging options.",
                 "If active     is false then main scene update and maintenance loops are suspended.\n"
+                    + "If animations is true  then extra animations debug information is logged.\n"
                     + "If collisions is false then collisions with other objects are turned off.\n"
                     + "If pbackup    is false then periodic scene backup is turned off.\n"
                     + "If physics    is false then all physics objects are non-physical.\n"
@@ -120,10 +122,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
         {
             if (args.Length == 3)
             {
-                if (MainConsole.Instance.ConsoleScene == null)
-                    MainConsole.Instance.Output("Please use 'change region <regioname>' first");
-                else
-                    OutputSceneDebugOptions();
+                if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
+                    return;
+
+                OutputSceneDebugOptions();
             }
             else
             {
@@ -135,12 +137,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
         {
             ConsoleDisplayList cdl = new ConsoleDisplayList();
             cdl.AddRow("active", m_scene.Active);
+            cdl.AddRow("animations", m_scene.DebugAnimations);
             cdl.AddRow("pbackup", m_scene.PeriodicBackup);
             cdl.AddRow("physics", m_scene.PhysicsEnabled);
             cdl.AddRow("scripting", m_scene.ScriptsEnabled);
             cdl.AddRow("teleport", m_scene.DebugTeleporting);
             cdl.AddRow("updates", m_scene.DebugUpdates);
 
+            MainConsole.Instance.OutputFormat("Scene {0} options:", m_scene.Name);
             MainConsole.Instance.Output(cdl.ToString());
         }
 
@@ -148,18 +152,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
         {
             if (args.Length == 5)
             {
-                if (MainConsole.Instance.ConsoleScene == null)
-                {
-                    MainConsole.Instance.Output("Please use 'change region <regioname>' first");
-                }
-                else
-                {
-                    string key = args[3];
-                    string value = args[4];
-                    SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } });
+                if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
+                    return;
 
-                    MainConsole.Instance.OutputFormat("Set debug scene {0} = {1}", key, value);
-                }
+                string key = args[3];
+                string value = args[4];
+                SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } });
+
+                MainConsole.Instance.OutputFormat("Set {0} debug scene {1} = {2}", m_scene.Name, key, value);
             }
             else
             {
@@ -178,6 +178,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                     m_scene.Active = active;
             }
 
+            if (options.ContainsKey("animations"))
+            {
+                bool active;
+
+                if (bool.TryParse(options["animations"], out active))
+                    m_scene.DebugAnimations = active;
+            }
+
             if (options.ContainsKey("pbackup"))
             {
                 bool active;