aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMike Mazur2008-08-12 06:21:02 +0000
committerMike Mazur2008-08-12 06:21:02 +0000
commit8ea92c0669de17f4967540ecc1350860aa346f06 (patch)
treefb3502211612e8b34e1102ba39880a2fd77f2e5c /OpenSim/Region/Environment
parentRemove "static" from the AsyncCommand Manager to make it work properly (diff)
downloadopensim-SC_OLD-8ea92c0669de17f4967540ecc1350860aa346f06.zip
opensim-SC_OLD-8ea92c0669de17f4967540ecc1350860aa346f06.tar.gz
opensim-SC_OLD-8ea92c0669de17f4967540ecc1350860aa346f06.tar.bz2
opensim-SC_OLD-8ea92c0669de17f4967540ecc1350860aa346f06.tar.xz
Thanks, lulurun, for a patch that addresses inventory problems that occur
occasionally, but are fixed on restart (issue 1919). This patch introduces the following changes: 1. when a user teleports out of Region A, remove that user's profile from the Region A user profile cache 2. when a user crosses between regions out of Region A, remove that user's profile from the Region A user profile cache 3. the user profile cache's session ID member can now be set (written), and is updated each time a connection with a new avatar is established (ie: a new avatar enters the region) 4. when a region server looks up a user profile and a cache miss occurs, fetch the user profile from the user server first instead of immediately returning null
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
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
2015 "[SCENE]: Adding new {0} agent {1} {2} in {3}", 2015 "[SCENE]: Adding new {0} agent {1} {2} in {3}",
2016 (child ? "child" : "root"), client.Name, client.AgentId, RegionInfo.RegionName); 2016 (child ? "child" : "root"), client.Name, client.AgentId, RegionInfo.RegionName);
2017 2017
2018 CommsManager.UserProfileCacheService.AddNewUser(client); 2018 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
2019 2019
2020 CreateAndAddScenePresence(client, child); 2020 CreateAndAddScenePresence(client, child);
2021 } 2021 }
@@ -2455,6 +2455,9 @@ namespace OpenSim.Region.Environment.Scenes
2455 agent.circuitcode, agent.AgentID, RegionInfo.RegionName); 2455 agent.circuitcode, agent.AgentID, RegionInfo.RegionName);
2456 2456
2457 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); 2457 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
2458 // rewrite session_id
2459 CachedUserInfo userinfo = CommsManager.UserProfileCacheService.GetUserDetails(agent.AgentID);
2460 userinfo.SessionID = agent.SessionID;
2458 } 2461 }
2459 else 2462 else
2460 { 2463 {
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
627 { 627 {
628 SendCloseChildAgentConnections(avatar.UUID,avatar.GetKnownRegionList()); 628 SendCloseChildAgentConnections(avatar.UUID,avatar.GetKnownRegionList());
629 } 629 }
630 // if (teleport success) // seems to be always success here
631 // the user may change thier profile information in other region,
632 // so the userinfo in UserProfileCache is not reliable any more, delete it
633 m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
634 m_log.InfoFormat("User {0} is going to another region, profile cache removed", avatar.UUID);
630 } 635 }
631 else 636 else
632 { 637 {
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
1989 1989
1990 m_scene.SendKillObject(m_localId); 1990 m_scene.SendKillObject(m_localId);
1991 m_scene.NotifyMyCoarseLocationChange(); 1991 m_scene.NotifyMyCoarseLocationChange();
1992 // the user may change thier profile information in other region,
1993 // so the userinfo in UserProfileCache is not reliable any more, delete it
1994 m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID);
1995 m_log.InfoFormat("User {0} is going to another region, profile cache removed", UUID);
1992 } 1996 }
1993 else 1997 else
1994 { 1998 {