diff options
author | Justin Clark-Casey (justincc) | 2011-11-02 13:16:02 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-02 13:16:02 +0000 |
commit | b6873a7b5d8bbb4936550b38b0fbc9b0a8463b63 (patch) | |
tree | 977e826dfc1c270fd8c8e444b6c1e7e9dbef7049 | |
parent | Restore the recursive calling of PRIM_LINK_TARGET because the version I made (diff) | |
download | opensim-SC-b6873a7b5d8bbb4936550b38b0fbc9b0a8463b63.zip opensim-SC-b6873a7b5d8bbb4936550b38b0fbc9b0a8463b63.tar.gz opensim-SC-b6873a7b5d8bbb4936550b38b0fbc9b0a8463b63.tar.bz2 opensim-SC-b6873a7b5d8bbb4936550b38b0fbc9b0a8463b63.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 36e6665..aeba35f 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -266,7 +266,14 @@ namespace OpenSim.Server.Base | |||
266 | { | 266 | { |
267 | while (m_Running) | 267 | while (m_Running) |
268 | { | 268 | { |
269 | MainConsole.Instance.Prompt(); | 269 | try |
270 | { | ||
271 | MainConsole.Instance.Prompt(); | ||
272 | } | ||
273 | catch (Exception e) | ||
274 | { | ||
275 | m_log.ErrorFormat("Command error: {0}", e); | ||
276 | } | ||
270 | } | 277 | } |
271 | 278 | ||
272 | if (m_pidFile != String.Empty) | 279 | if (m_pidFile != String.Empty) |