Merge branch '0.6.9-post-fixes' into careminster

OpenSim/Framework/Console/LocalConsole.cs

@@ -105,14 +105,30 @@ namespace OpenSim.Framework.Console
             int left = System.Console.CursorLeft;
 
             if (left < 0)
+            {
                 System.Console.CursorLeft = 0;
-            else if (left >= System.Console.BufferWidth)
+            }
-                System.Console.CursorLeft = System.Console.BufferWidth - 1;
+            else 
+            {
+                int bw = System.Console.BufferWidth;
+                
+                // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
+                if (bw > 0 && left >= bw)
+                    System.Console.CursorLeft = bw - 1;
+            }
             
             if (top < 0)
+            {
                 top = 0;
-            if (top >= System.Console.BufferHeight)
+            }
-                top = System.Console.BufferHeight - 1;
+            else                
+            {
+                int bh = System.Console.BufferHeight;
+                
+                // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
+                if (bh > 0 && top >= bh)
+                    top = bh - 1;
+            }
 
             System.Console.CursorTop = top;
 
@@ -138,14 +154,29 @@ namespace OpenSim.Framework.Console
             int top = System.Console.CursorTop;
 
             if (top < 0)
+            {
                 System.Console.CursorTop = 0;
-            else if (top >= System.Console.BufferHeight)
+            }
-                System.Console.CursorTop = System.Console.BufferHeight - 1;
+            else 
+            {
+                int bh = System.Console.BufferHeight;
+                // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
+                if (bh > 0 && top >= bh)
+                    System.Console.CursorTop = bh - 1;
+            }
             
             if (left < 0)
+            {
                 left = 0;
-            if (left >= System.Console.BufferWidth)
+            }
-                left = System.Console.BufferWidth - 1;
+            else
+            {
+                int bw = System.Console.BufferWidth;
+
+                // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
+                if (bw > 0 && left >= bw)
+                    left = bw - 1;
+            }
 
             System.Console.CursorLeft = left;
 

README.txt

@@ -59,7 +59,8 @@ Once you are presented with a prompt that looks like:
 
 You have successfully started OpenSim.
 
-Before you can log in you will need to create a user account.  You can do
+Before you can log in you will need to create a user account if you didn't already create
+your user as the "Master Avatar" during the region configuration stage.  You can do
 this by running the "create user" command on the OpenSim console.  This will
 ask you a series of questions such as first name, last name and password.