From b6873a7b5d8bbb4936550b38b0fbc9b0a8463b63 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 2 Nov 2011 13:16:02 +0000
Subject: [PATCH] Catch any exceptions exiting the top of the robust console,
 as we already do for the main simulator.

This prevents issues such as transient mono console problems from crashing the server.
---
 OpenSim/Server/Base/ServicesServerBase.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 36e66650c2..aeba35ff1c 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -266,7 +266,14 @@ namespace OpenSim.Server.Base
         {
             while (m_Running)
             {
-                MainConsole.Instance.Prompt();
+                try
+                {
+                    MainConsole.Instance.Prompt();
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("Command error: {0}", e);
+                }
             }
 
             if (m_pidFile != String.Empty)