aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-10 18:50:25 +0000
committerJustin Clarke Casey2009-02-10 18:50:25 +0000
commit0cd5a353cf61b7f2fa1a1984add74c83a5fa0766 (patch)
tree4155f6073b0723d9a580091841d9db40ca81bfe1 /OpenSim
parent* Implement merging of oars in code (diff)
downloadopensim-SC_OLD-0cd5a353cf61b7f2fa1a1984add74c83a5fa0766.zip
opensim-SC_OLD-0cd5a353cf61b7f2fa1a1984add74c83a5fa0766.tar.gz
opensim-SC_OLD-0cd5a353cf61b7f2fa1a1984add74c83a5fa0766.tar.bz2
opensim-SC_OLD-0cd5a353cf61b7f2fa1a1984add74c83a5fa0766.tar.xz
* Stop OpenSim crashing if an exception from a command makes it right up to the top of the stack
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/Application.cs10
1 files changed, 8 insertions, 2 deletions
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
111 111
112 while (true) 112 while (true)
113 { 113 {
114 MainConsole.Instance.Prompt(); 114 try
115 {
116 MainConsole.Instance.Prompt();
117 }
118 catch (Exception e)
119 {
120 Console.WriteLine("Caught exception from command: {0}", e);
121 }
115 } 122 }
116
117 } 123 }
118 } 124 }
119 125