diff options
| author | Dan Lake | 2011-11-02 14:59:34 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-11-02 14:59:34 -0700 |
| commit | a724ebacd79de37823fe8a17be195509b15a2a33 (patch) | |
| tree | 8bb1bd5cb99222c92f4ce862cd512be6fb48052b /OpenSim/Server | |
| parent | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. (diff) | |
| parent | Get some hopefully more useful exception information when OpenJPEG.EncodeFrom... (diff) | |
| download | opensim-SC_OLD-a724ebacd79de37823fe8a17be195509b15a2a33.zip opensim-SC_OLD-a724ebacd79de37823fe8a17be195509b15a2a33.tar.gz opensim-SC_OLD-a724ebacd79de37823fe8a17be195509b15a2a33.tar.bz2 opensim-SC_OLD-a724ebacd79de37823fe8a17be195509b15a2a33.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
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) |