From c28a2f05caae50590e64e61d8b7358ee92a7fca3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Jan 2013 00:54:28 +0000
Subject: minor: make spacing consistent in console help output

---
 OpenSim/Framework/Console/CommandConsole.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index de30414..f9c9307 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -110,10 +110,11 @@ namespace OpenSim.Framework.Console
             // Remove initial help keyword
             helpParts.RemoveAt(0);
 
+            help.Add(""); // Will become a newline.
+
             // General help
             if (helpParts.Count == 0)
             {
-                help.Add(""); // Will become a newline.
                 help.Add(GeneralHelpText);
                 help.Add(ItemHelpText);
                 help.AddRange(CollectModulesHelp(tree));
@@ -127,6 +128,8 @@ namespace OpenSim.Framework.Console
                 help.AddRange(CollectHelp(helpParts));
             }
 
+            help.Add(""); // Will become a newline.
+
             return help;
         }
 
@@ -200,8 +203,8 @@ namespace OpenSim.Framework.Console
                 
                 help.Add(commandInfo.descriptive_help);
 
-                if (descriptiveHelp != string.Empty)
-                    help.Add(string.Empty);
+//                if (descriptiveHelp != string.Empty)
+//                    help.Add(string.Empty);
             }
             else
             {
-- 
cgit v1.1


From 290dc274ec0860e96f0c19479c8da512779cdab3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Jan 2013 01:04:43 +0000
Subject: minor: Remove unnecessary commented out code from last commit
 c28a2f05 and fix up code comment

---
 OpenSim/Framework/Console/CommandConsole.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index f9c9307..b9f402a 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -197,14 +197,11 @@ namespace OpenSim.Framework.Console
 
                 string descriptiveHelp = commandInfo.descriptive_help;
 
-                // If we do have some descriptive help then insert a spacing line before and after for readability.
+                // If we do have some descriptive help then insert a spacing line before for readability.
                 if (descriptiveHelp != string.Empty)
                     help.Add(string.Empty);
                 
                 help.Add(commandInfo.descriptive_help);
-
-//                if (descriptiveHelp != string.Empty)
-//                    help.Add(string.Empty);
             }
             else
             {
-- 
cgit v1.1


From b1b46872500476cf97b5de8c16012b8545fed0c7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Jan 2013 00:57:49 +0000
Subject: Add "show script timers" command to show script timers.  For debug
 purposes.

Also, "show sensors" changes to "show script sensors".
---
 OpenSim/Framework/Monitoring/MemoryWatchdog.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
index c6010cd..bc5ed97 100644
--- a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
+++ b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Monitoring
         /// </summary>
         public static double LastMemoryChurn
         {
-            get { if (m_samples.Count > 0) return m_samples.Last(); else return 0; }
+            get { if (m_samples.Count > 0) return m_samples.First(); else return 0; }
         }
 
         /// <summary>
-- 
cgit v1.1


From 84407e322f6469a3001b390f7c516f4eabaad1e6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Jan 2013 01:30:00 +0000
Subject: revert accidental change to MemoryWatchdog stat calculation in
 previous b1b4687

---
 OpenSim/Framework/Monitoring/MemoryWatchdog.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
index bc5ed97..c6010cd 100644
--- a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
+++ b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Monitoring
         /// </summary>
         public static double LastMemoryChurn
         {
-            get { if (m_samples.Count > 0) return m_samples.First(); else return 0; }
+            get { if (m_samples.Count > 0) return m_samples.Last(); else return 0; }
         }
 
         /// <summary>
-- 
cgit v1.1