diff options
| author | Justin Clark-Casey (justincc) | 2012-02-24 05:12:56 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-24 05:12:56 +0000 |
| commit | 84735b644cbd8902dd749fadb4056d26044fd564 (patch) | |
| tree | fbd9f55a5c62282f6b3876bcf6f5009d191376a2 /OpenSim | |
| parent | Stop spurious scene loop startup timeout alarms for scenes with many prims. (diff) | |
| download | opensim-SC_OLD-84735b644cbd8902dd749fadb4056d26044fd564.zip opensim-SC_OLD-84735b644cbd8902dd749fadb4056d26044fd564.tar.gz opensim-SC_OLD-84735b644cbd8902dd749fadb4056d26044fd564.tar.bz2 opensim-SC_OLD-84735b644cbd8902dd749fadb4056d26044fd564.tar.xz | |
Get rid of some of the identical exception catching in Scene.Update().
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 19d4bad..9bca654 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1368,26 +1368,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1368 | { | 1368 | { |
| 1369 | throw; | 1369 | throw; |
| 1370 | } | 1370 | } |
| 1371 | catch (AccessViolationException e) | ||
| 1372 | { | ||
| 1373 | m_log.ErrorFormat( | ||
| 1374 | "[REGION]: Failed on region {0} with exception {1}{2}", | ||
| 1375 | RegionInfo.RegionName, e.Message, e.StackTrace); | ||
| 1376 | } | ||
| 1377 | //catch (NullReferenceException e) | ||
| 1378 | //{ | ||
| 1379 | // m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); | ||
| 1380 | //} | ||
| 1381 | catch (InvalidOperationException e) | ||
| 1382 | { | ||
| 1383 | m_log.ErrorFormat( | ||
| 1384 | "[REGION]: Failed on region {0} with exception {1}{2}", | ||
| 1385 | RegionInfo.RegionName, e.Message, e.StackTrace); | ||
| 1386 | } | ||
| 1387 | catch (Exception e) | 1371 | catch (Exception e) |
| 1388 | { | 1372 | { |
| 1389 | m_log.ErrorFormat( | 1373 | m_log.ErrorFormat( |
| 1390 | "[REGION]: Failed on region {0} with exception {1}{2}", | 1374 | "[SCENE]: Failed on region {0} with exception {1}{2}", |
| 1391 | RegionInfo.RegionName, e.Message, e.StackTrace); | 1375 | RegionInfo.RegionName, e.Message, e.StackTrace); |
| 1392 | } | 1376 | } |
| 1393 | 1377 | ||