diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 90fe430..3cb1901 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -43,9 +43,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
43 | using OpenMetaverse; | 43 | using OpenMetaverse; |
44 | using log4net; | 44 | using log4net; |
45 | using Nini.Config; | 45 | using Nini.Config; |
46 | using Mono.Addins; | ||
46 | 47 | ||
47 | namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | 48 | namespace OpenSim.Region.CoreModules.Framework.EntityTransfer |
48 | { | 49 | { |
50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EntityTransferModule")] | ||
49 | public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule | 51 | public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule |
50 | { | 52 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 53 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -672,13 +674,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
672 | sp.Reset(); | 674 | sp.Reset(); |
673 | } | 675 | } |
674 | 676 | ||
675 | // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE! | 677 | // Commented pending deletion since this method no longer appears to do anything at all |
676 | if (sp.Scene.NeedSceneCacheClear(sp.UUID)) | 678 | // // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE! |
677 | { | 679 | // if (sp.Scene.NeedSceneCacheClear(sp.UUID)) |
678 | m_log.DebugFormat( | 680 | // { |
679 | "[ENTITY TRANSFER MODULE]: User {0} is going to another region, profile cache removed", | 681 | // m_log.DebugFormat( |
680 | sp.UUID); | 682 | // "[ENTITY TRANSFER MODULE]: User {0} is going to another region, profile cache removed", |
681 | } | 683 | // sp.UUID); |
684 | // } | ||
682 | 685 | ||
683 | m_entityTransferStateMachine.ResetFromTransit(sp.UUID); | 686 | m_entityTransferStateMachine.ResetFromTransit(sp.UUID); |
684 | } | 687 | } |
@@ -1237,14 +1240,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1237 | 1240 | ||
1238 | AgentHasMovedAway(agent, false); | 1241 | AgentHasMovedAway(agent, false); |
1239 | 1242 | ||
1240 | // the user may change their profile information in other region, | 1243 | // // the user may change their profile information in other region, |
1241 | // so the userinfo in UserProfileCache is not reliable any more, delete it | 1244 | // // so the userinfo in UserProfileCache is not reliable any more, delete it |
1242 | // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE! | 1245 | // // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE! |
1243 | if (agent.Scene.NeedSceneCacheClear(agent.UUID)) | 1246 | // if (agent.Scene.NeedSceneCacheClear(agent.UUID)) |
1244 | { | 1247 | // { |
1245 | m_log.DebugFormat( | 1248 | // m_log.DebugFormat( |
1246 | "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID); | 1249 | // "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID); |
1247 | } | 1250 | // } |
1248 | 1251 | ||
1249 | //m_log.Debug("AFTER CROSS"); | 1252 | //m_log.Debug("AFTER CROSS"); |
1250 | //Scene.DumpChildrenSeeds(UUID); | 1253 | //Scene.DumpChildrenSeeds(UUID); |