From cd89864f4c8bfa093ded224245a7197822c7bd80 Mon Sep 17 00:00:00 2001
From: Mike Mazur <mmazur@gmail.com>
Date: Wed, 13 Aug 2008 06:08:26 +0000
Subject: [PATCH] Thanks, lulurun, for a patch that clears and refreshes and
 outdated user profile cache (issue 1919).

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ef0a119130..c8cfd3aad6 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2459,7 +2459,12 @@ namespace OpenSim.Region.Environment.Scenes
                 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
                 // rewrite session_id
                 CachedUserInfo userinfo = CommsManager.UserProfileCacheService.GetUserDetails(agent.AgentID);
-                userinfo.SessionID = agent.SessionID;
+                if (userinfo.SessionID != agent.SessionID) // means cache hit but outdated session ID
+                {
+                    // Let's re-grab the whole user profile, because anything may have changed on the user server.
+                    CommsManager.UserProfileCacheService.RemoveUser(agent.AgentID);
+                    userinfo = CommsManager.UserProfileCacheService.GetUserDetails(agent.AgentID);
+                }
             }
             else
             {