From 0cd5a353cf61b7f2fa1a1984add74c83a5fa0766 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 10 Feb 2009 18:50:25 +0000
Subject: * Stop OpenSim crashing if an exception from a command makes it right
 up to the top of the stack

---
 OpenSim/Region/Application/Application.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index ad98aa3..0195bfa 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -111,9 +111,15 @@ namespace OpenSim
 
                 while (true)
                 {
-                    MainConsole.Instance.Prompt();
+                    try
+                    {
+                        MainConsole.Instance.Prompt();
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine("Caught exception from command: {0}", e);
+                    }
                 }
-
             }
         }
 
-- 
cgit v1.1