3 files changed, 13 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f39a0e6..b54713f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2015,7 +2015,7 @@ namespace OpenSim.Region.Environment.Scenes
                     "[SCENE]: Adding new {0} agent {1} {2} in {3}", 
                     (child ? "child" : "root"), client.Name, client.AgentId, RegionInfo.RegionName);
 
-                CommsManager.UserProfileCacheService.AddNewUser(client);
+                CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
 
                 CreateAndAddScenePresence(client, child);
             }
@@ -2455,6 +2455,9 @@ namespace OpenSim.Region.Environment.Scenes
                     agent.circuitcode, agent.AgentID, RegionInfo.RegionName);
 
                 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+                // rewrite session_id
+                CachedUserInfo userinfo = CommsManager.UserProfileCacheService.GetUserDetails(agent.AgentID);
+                userinfo.SessionID = agent.SessionID;
             }
             else
             {
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index cb37faf..348b643 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -627,6 +627,11 @@ namespace OpenSim.Region.Environment.Scenes
                         {
                             SendCloseChildAgentConnections(avatar.UUID,avatar.GetKnownRegionList());
                         }
+                        // if (teleport success) // seems to be always success here
+                        // the user may change thier profile information in other region,
+                        // so the userinfo in UserProfileCache is not reliable any more, delete it
+                        m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
+                        m_log.InfoFormat("User {0} is going to another region, profile cache removed", avatar.UUID);
                     }
                     else
                     {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 1721acb..5c90bf3 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1989,6 +1989,10 @@ namespace OpenSim.Region.Environment.Scenes
                         
                     m_scene.SendKillObject(m_localId);
                     m_scene.NotifyMyCoarseLocationChange();
+                    // the user may change thier profile information in other region,
+                    // so the userinfo in UserProfileCache is not reliable any more, delete it
+                    m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID);
+                    m_log.InfoFormat("User {0} is going to another region, profile cache removed", UUID);
                 }
                 else
                 {