*Fixed bug that caused failure when System.Console.Readline returns null (no stdin)

*Fixed bug that would crash the simulator if there were two physics/meshing engines loaded with the same name.

1 files changed, 10 insertions, 2 deletions

diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 5d8e5b9..c813e91 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -230,7 +230,14 @@ namespace OpenSim.Framework.Console
         {
             try
             {
-                return System.Console.ReadLine();
+                                string line = System.Console.ReadLine();
+                                while(line == null)
+                                {
+
+                                        line = System.Console.ReadLine();
+                                }
+                                        
+                return line;
             }
             catch (Exception e)
             {
@@ -357,7 +364,8 @@ namespace OpenSim.Framework.Console
         public void Prompt()
         {
             string tempstr = CmdPrompt(m_componentName + "# ");
-            RunCommand(tempstr);
+                        RunCommand(tempstr);
+                        
         }
 
         public void RunCommand(string cmdline)