aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-08-11 12:55:46 -0700
committerDiva Canto2009-08-11 12:55:46 -0700
commitbf3f376b107659ce3aff03c736b76dd56f175735 (patch)
tree9e347f0488fe6325f312a388a3721359df3297e1
parentDisabling the remote call for the time being, so that I can test it on a grid... (diff)
downloadopensim-SC-bf3f376b107659ce3aff03c736b76dd56f175735.zip
opensim-SC-bf3f376b107659ce3aff03c736b76dd56f175735.tar.gz
opensim-SC-bf3f376b107659ce3aff03c736b76dd56f175735.tar.bz2
opensim-SC-bf3f376b107659ce3aff03c736b76dd56f175735.tar.xz
Fixed test for detecting when user is no longer in sim.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index 57c2091..b4785f4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -73,14 +73,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
73 foreach (Scene s in m_Scenes) 73 foreach (Scene s in m_Scenes)
74 { 74 {
75 s.TryGetAvatar(clientID, out sp); 75 s.TryGetAvatar(clientID, out sp);
76 if (sp != null) 76 if ((sp != null) && !sp.IsChildAgent)
77 { 77 {
78 m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed, but user {0} still in sim. Keeping system folders in cache", clientID); 78 m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, but user {1} still in sim. Keeping system folders in cache",
79 scene.RegionInfo.RegionName, clientID);
79 return; 80 return;
80 } 81 }
81 } 82 }
82 83
83 m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed, user {0} out of sim. Dropping system folders", clientID); 84 m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, user {1} out of sim. Dropping system folders",
85 scene.RegionInfo.RegionName, clientID);
84 // Drop system folders 86 // Drop system folders
85 lock (m_InventoryCache) 87 lock (m_InventoryCache)
86 if (m_InventoryCache.ContainsKey(clientID)) 88 if (m_InventoryCache.ContainsKey(clientID))