diff options
| author | Justin Clark-Casey (justincc) | 2011-09-23 22:45:02 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-09-23 22:45:02 +0100 |
| commit | d8d048cfa1c9faeefba00516054a30e56641e709 (patch) | |
| tree | a59cff0635ac0dc56e5f5b1b88b192839bcbf806 /OpenSim | |
| parent | Catch but don't print out exceptions that make it to the top of the async_cal... (diff) | |
| download | opensim-SC_OLD-d8d048cfa1c9faeefba00516054a30e56641e709.zip opensim-SC_OLD-d8d048cfa1c9faeefba00516054a30e56641e709.tar.gz opensim-SC_OLD-d8d048cfa1c9faeefba00516054a30e56641e709.tar.bz2 opensim-SC_OLD-d8d048cfa1c9faeefba00516054a30e56641e709.tar.xz | |
oops, reinstate the try catching of async_call_method but leave the logging disabled
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index f187ab8..00ef8ca 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1550,16 +1550,16 @@ namespace OpenSim.Framework | |||
| 1550 | { | 1550 | { |
| 1551 | Culture.SetCurrentCulture(); | 1551 | Culture.SetCurrentCulture(); |
| 1552 | 1552 | ||
| 1553 | // try | 1553 | try |
| 1554 | // { | 1554 | { |
| 1555 | callback(o); | 1555 | callback(o); |
| 1556 | // } | 1556 | } |
| 1557 | // catch (Exception e) | 1557 | catch (Exception e) |
| 1558 | // { | 1558 | { |
| 1559 | // m_log.ErrorFormat( | 1559 | // m_log.ErrorFormat( |
| 1560 | // "[UTIL]: Continuing after async_call_method thread terminated with exception {0}{1}", | 1560 | // "[UTIL]: Continuing after async_call_method thread terminated with exception {0}{1}", |
| 1561 | // e.Message, e.StackTrace); | 1561 | // e.Message, e.StackTrace); |
| 1562 | // } | 1562 | } |
| 1563 | }; | 1563 | }; |
| 1564 | 1564 | ||
| 1565 | switch (FireAndForgetMethod) | 1565 | switch (FireAndForgetMethod) |