diff options
author | UbitUmarov | 2017-05-30 16:51:49 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-30 16:51:49 +0100 |
commit | 0fa3af96a421aa64480d97f103c4ca15c045c89b (patch) | |
tree | 9a1ab26ef9247a0e4e685ca0a73d9afd23de14aa /OpenSim | |
parent | do another dns request via new cache. My problems bf wheren't mono after all,... (diff) | |
download | opensim-SC_OLD-0fa3af96a421aa64480d97f103c4ca15c045c89b.zip opensim-SC_OLD-0fa3af96a421aa64480d97f103c4ca15c045c89b.tar.gz opensim-SC_OLD-0fa3af96a421aa64480d97f103c4ca15c045c89b.tar.bz2 opensim-SC_OLD-0fa3af96a421aa64480d97f103c4ca15c045c89b.tar.xz |
remove anoying crossing messages on open borders
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 7214414..a1ada4c 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1532,13 +1532,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1532 | CrossAsyncDelegate icon = (CrossAsyncDelegate)iar.AsyncState; | 1532 | CrossAsyncDelegate icon = (CrossAsyncDelegate)iar.AsyncState; |
1533 | ScenePresence agent = icon.EndInvoke(iar); | 1533 | ScenePresence agent = icon.EndInvoke(iar); |
1534 | 1534 | ||
1535 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname); | ||
1536 | 1535 | ||
1537 | if(!agent.IsChildAgent) | 1536 | if(!agent.IsChildAgent) |
1538 | { | 1537 | { |
1539 | // crossing failed | 1538 | // crossing failed |
1540 | agent.CrossToNewRegionFail(); | 1539 | agent.CrossToNewRegionFail(); |
1541 | } | 1540 | } |
1541 | else | ||
1542 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname); | ||
1543 | |||
1542 | agent.IsInTransit = false; | 1544 | agent.IsInTransit = false; |
1543 | } | 1545 | } |
1544 | 1546 | ||
@@ -2287,9 +2289,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2287 | protected GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, | 2289 | protected GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, |
2288 | double px, double py, uint pSizeHint) | 2290 | double px, double py, uint pSizeHint) |
2289 | { | 2291 | { |
2290 | m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py); | 2292 | // m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py); |
2291 | GridRegion ret = null; | 2293 | GridRegion ret = null; |
2292 | const double fudge = 2.0; | ||
2293 | 2294 | ||
2294 | if (m_notFoundLocationCache.Contains(px, py)) | 2295 | if (m_notFoundLocationCache.Contains(px, py)) |
2295 | { | 2296 | { |