Merge branch 'master' into careminster-presence-refactor

2 files changed, 16 insertions, 3 deletions

diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 5f2f404..eda41b8 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -473,9 +473,11 @@ namespace OpenSim.Framework.Console
                             y = -1;
                         }
 
+                        string commandLine = cmdline.ToString();
+                        
                         if (isCommand)
                         {
-                            string[] cmd = Commands.Resolve(Parser.Parse(cmdline.ToString()));
+                            string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
 
                             if (cmd.Length != 0)
                             {
@@ -491,8 +493,11 @@ namespace OpenSim.Framework.Console
                             }
                         }
 
-                        //AddToHistory(cmdline.ToString());
-                        return cmdline.ToString();
+                        // If we're not echoing to screen (e.g. a password) then we probably don't want it in history
+                        if (echo && commandLine != "")
+                            AddToHistory(commandLine);
+                        
+                        return commandLine;
                     default:
                         break;
                     }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index f1d622e..6bee4be 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -451,6 +451,14 @@ namespace OpenSim.Framework
             return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
         }
 
+        /// <summary>
+        /// Are the co-ordinates of the new region visible from the old region?
+        /// </summary>
+        /// <param name="oldx">Old region x-coord</param>
+        /// <param name="newx">New region x-coord</param>
+        /// <param name="oldy">Old region y-coord</param>
+        /// <param name="newy">New region y-coord</param>
+        /// <returns></returns>        
         public static bool IsOutsideView(uint oldx, uint newx, uint oldy, uint newy)
         {
             // Eventually this will be a function of the draw distance / camera position too.