diff options
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index aeca7df..2e15b86 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1266,7 +1266,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1266 | // allocations, and there is no more work to be done until someone logs in | 1266 | // allocations, and there is no more work to be done until someone logs in |
1267 | GC.Collect(); | 1267 | GC.Collect(); |
1268 | 1268 | ||
1269 | m_log.Debug("[REGION]: Enabling Logins"); | 1269 | m_log.DebugFormat("[REGION]: Enabling Logins for {0}", RegionInfo.RegionName); |
1270 | loginsdisabled = false; | 1270 | loginsdisabled = false; |
1271 | } | 1271 | } |
1272 | } | 1272 | } |
@@ -1276,24 +1276,25 @@ namespace OpenSim.Region.Framework.Scenes | |||
1276 | } | 1276 | } |
1277 | catch (AccessViolationException e) | 1277 | catch (AccessViolationException e) |
1278 | { | 1278 | { |
1279 | m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); | 1279 | m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); |
1280 | } | 1280 | } |
1281 | //catch (NullReferenceException e) | 1281 | //catch (NullReferenceException e) |
1282 | //{ | 1282 | //{ |
1283 | // m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); | 1283 | // m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); |
1284 | //} | 1284 | //} |
1285 | catch (InvalidOperationException e) | 1285 | catch (InvalidOperationException e) |
1286 | { | 1286 | { |
1287 | m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); | 1287 | m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); |
1288 | } | 1288 | } |
1289 | catch (Exception e) | 1289 | catch (Exception e) |
1290 | { | 1290 | { |
1291 | m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); | 1291 | m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); |
1292 | } | 1292 | } |
1293 | finally | 1293 | finally |
1294 | { | 1294 | { |
1295 | m_lastupdate = DateTime.UtcNow; | 1295 | m_lastupdate = DateTime.UtcNow; |
1296 | } | 1296 | } |
1297 | |||
1297 | maintc = Environment.TickCount - maintc; | 1298 | maintc = Environment.TickCount - maintc; |
1298 | maintc = (int)(m_timespan * 1000) - maintc; | 1299 | maintc = (int)(m_timespan * 1000) - maintc; |
1299 | 1300 | ||