Merge branch 'master' into bigmerge

6 files changed, 52 insertions, 24 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index f6ce291..b4dbeae 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -242,6 +242,14 @@ namespace OpenSim
                                           + "If an avatar name is given then only packets from that avatar are logged",
                                           Debug);
 
+            m_console.Commands.AddCommand("region", false, "debug http",
+                                          "debug http <level>",
+                                          "Turn on inbound http request debugging for everything except the event queue (see debug eq).",
+                                            "If level >= 2 then the handler used to service the request is logged.\n"
+                                          + "If level >= 1 then incoming HTTP requests are logged.\n"
+                                          + "If level <= 0 then no extra http logging is done.\n",
+                                          Debug);
+
             m_console.Commands.AddCommand("region", false, "debug scene",
                                           "debug scene <cripting> <collisions> <physics>",
                                           "Turn on scene debugging", Debug);
@@ -337,7 +345,7 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("region", false, "backup",
                                           "backup",
-                                          "Persist objects to the database now", RunCommand);
+                                          "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand);
 
             m_console.Commands.AddCommand("region", false, "create region",
                                           "create region [\"region name\"] <region_file.ini>",
@@ -886,13 +894,30 @@ namespace OpenSim
                         if (int.TryParse(args[2], out newDebug))
                         {
                             m_sceneManager.SetDebugPacketLevelOnCurrentScene(newDebug, name);
+                            // We provide user information elsewhere if any clients had their debug level set.
+//                            MainConsole.Instance.OutputFormat("Debug packet level set to {0}", newDebug);
                         }
                         else
                         {
-                            MainConsole.Instance.Output("packet debug should be 0..255");
+                            MainConsole.Instance.Output("Usage: debug packet 0..255");
+                        }
+                    }
+
+                    break;
+
+                case "http":
+                    if (args.Length == 3)
+                    {
+                        int newDebug;
+                        if (int.TryParse(args[2], out newDebug))
+                        {
+                            MainServer.Instance.DebugLevel = newDebug;
+                            MainConsole.Instance.OutputFormat("Debug http level set to {0}", newDebug);
+                            break;
                         }
                     }
 
+                    MainConsole.Instance.Output("Usage: debug http 0..2");
                     break;
 
                 case "scene":
@@ -917,13 +942,13 @@ namespace OpenSim
                     }
                     else
                     {
-                        MainConsole.Instance.Output("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
+                        MainConsole.Instance.Output("Usage: debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
                     }
 
                     break;
 
                 default:
-                    MainConsole.Instance.Output("Unknown debug");
+                    MainConsole.Instance.Output("Unknown debug command");
                     break;
             }
         }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 8f0ae76..07b4df3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -238,7 +238,8 @@ namespace OpenSim.Region.ClientStack.Linden
                 return string.Empty;
             }
 
-            Hashtable caps = m_HostCapsObj.CapsHandlers.CapsDetails;
+            Hashtable caps = m_HostCapsObj.CapsHandlers.GetCapsDetails(true);
+
             // Add the external too
             foreach (KeyValuePair<string, string> kvp in m_HostCapsObj.ExternalCapsHandlers)
                 caps[kvp.Key] = kvp.Value;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 5c721d4..9f27abc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -110,8 +110,9 @@ namespace OpenSim.Region.ClientStack.Linden
                     false,
                     "debug eq",
                     "debug eq [0|1]",
+                    "Turn on event queue debugging",                                   
                     "debug eq 1 will turn on event queue debugging.  This will log all outgoing event queue messages to clients.\n"
-                        + "debug eq 1 will turn off event queue debugging.",
+                        + "debug eq 0 will turn off event queue debugging.",
                     HandleDebugEq);
             }
             else
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index babeaab..97cd738 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Text;
 using log4net;
 using Nini.Config;
 using Mono.Addins;
@@ -46,6 +47,8 @@ namespace OpenSim.Region.CoreModules.Framework
     public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule
     { 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_showCapsCommandFormat = "   {0,-38} {1,-60}\n";
         
         protected Scene m_scene;
         
@@ -68,7 +71,7 @@ namespace OpenSim.Region.CoreModules.Framework
             m_scene.RegisterModuleInterface<ICapabilitiesModule>(this);
             MainConsole.Instance.Commands.AddCommand("Capabilities", false, "show caps",
                 "show caps",
-                "Shows all registered capabilities", CapabilitiesCommand);
+                "Shows all registered capabilities", HandleShowCapsCommand);
         }
 
         public void RegionLoaded(Scene scene)
@@ -228,21 +231,23 @@ namespace OpenSim.Region.CoreModules.Framework
             }
         }
 
-        private void CapabilitiesCommand(string module, string[] cmdparams)
+        private void HandleShowCapsCommand(string module, string[] cmdparams)
         {
-            System.Text.StringBuilder caps = new System.Text.StringBuilder();
+            StringBuilder caps = new StringBuilder();
             caps.AppendFormat("Region {0}:\n", m_scene.RegionInfo.RegionName);
 
             foreach (KeyValuePair<UUID, Caps> kvp in m_capsObjects)
             {
                 caps.AppendFormat("** User {0}:\n", kvp.Key);
-                for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.CapsDetails.GetEnumerator(); kvp2.MoveNext(); )
+
+                for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false).GetEnumerator(); kvp2.MoveNext(); )
                 {
                     Uri uri = new Uri(kvp2.Value.ToString());
-                    caps.AppendFormat("   {0} = {1}\n", kvp2.Key, uri.PathAndQuery);
+                    caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
                 }
+
                 foreach (KeyValuePair<string, string> kvp3 in kvp.Value.ExternalCapsHandlers)
-                    caps.AppendFormat("   {0} = {1}\n", kvp3.Key, kvp3.Value);
+                    caps.AppendFormat(m_showCapsCommandFormat, kvp3.Key, kvp3.Value);
             }
 
             MainConsole.Instance.Output(caps.ToString());
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 3963474..c1b8764 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -218,9 +218,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             m_scene.AddCommand(this, "debug permissions",
                     "debug permissions <true / false>",
-                    "Enable permissions debugging",
-                    HandleDebugPermissions);
-                    
+                    "Turn on permissions debugging",
+                    HandleDebugPermissions);                    
                     
             string grant = myConfig.GetString("GrantLSL","");
             if (grant.Length > 0) {
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 53d5e4c..f15e81b 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -171,16 +171,13 @@ namespace OpenSim.Region.Physics.Meshing
 
             foreach (Vector3 v in meshIn.getVertexList())
             {
-                if (v != null)
-                {
-                    if (v.X < minX) minX = v.X;
-                    if (v.Y < minY) minY = v.Y;
-                    if (v.Z < minZ) minZ = v.Z;
+                if (v.X < minX) minX = v.X;
+                if (v.Y < minY) minY = v.Y;
+                if (v.Z < minZ) minZ = v.Z;
 
-                    if (v.X > maxX) maxX = v.X;
-                    if (v.Y > maxY) maxY = v.Y;
-                    if (v.Z > maxZ) maxZ = v.Z;
-                }
+                if (v.X > maxX) maxX = v.X;
+                if (v.Y > maxY) maxY = v.Y;
+                if (v.Z > maxZ) maxZ = v.Z;
             }
 
             return CreateSimpleBoxMesh(minX, maxX, minY, maxY, minZ, maxZ);