Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations since the call itself does nothing and the return value is ignored by all callers.

This is a very old method (+4 years) so is probably confusing code cruft.

1 files changed, 16 insertions, 15 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 90fe430..7498cfe 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -672,13 +672,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.Reset();
             }
 
-            // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
-            if (sp.Scene.NeedSceneCacheClear(sp.UUID))
-            {
-                m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: User {0} is going to another region, profile cache removed",
-                    sp.UUID);
-            }
+            // Commented pending deletion since this method no longer appears to do anything at all
+//            // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
+//            if (sp.Scene.NeedSceneCacheClear(sp.UUID))
+//            {
+//                m_log.DebugFormat(
+//                    "[ENTITY TRANSFER MODULE]: User {0} is going to another region, profile cache removed",
+//                    sp.UUID);
+//            }
 
             m_entityTransferStateMachine.ResetFromTransit(sp.UUID);
         }
@@ -1237,14 +1238,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 AgentHasMovedAway(agent, false);
 
-                // the user may change their profile information in other region,
-                // so the userinfo in UserProfileCache is not reliable any more, delete it
-                // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
-                if (agent.Scene.NeedSceneCacheClear(agent.UUID))
-                {
-                    m_log.DebugFormat(
-                        "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
-                }
+//                // the user may change their profile information in other region,
+//                // so the userinfo in UserProfileCache is not reliable any more, delete it
+//                // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
+//                if (agent.Scene.NeedSceneCacheClear(agent.UUID))
+//                {
+//                    m_log.DebugFormat(
+//                        "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
+//                }
     
                 //m_log.Debug("AFTER CROSS");
                 //Scene.DumpChildrenSeeds(UUID);