diff options
| author | Diva Canto | 2013-06-09 20:20:37 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-06-09 20:20:37 -0700 |
| commit | e741e5ebce7759a7ee75c638d73e17c8a5f38394 (patch) | |
| tree | 854a6d9ad6038a4ad63aae1c88f43de5898f2aa4 /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-e741e5ebce7759a7ee75c638d73e17c8a5f38394.zip opensim-SC_OLD-e741e5ebce7759a7ee75c638d73e17c8a5f38394.tar.gz opensim-SC_OLD-e741e5ebce7759a7ee75c638d73e17c8a5f38394.tar.bz2 opensim-SC_OLD-e741e5ebce7759a7ee75c638d73e17c8a5f38394.tar.xz | |
More on mantis #6666 -- Groups V2 remote connector.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs index e7d38c2..79d6fc5 100644 --- a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs +++ b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | |||
| @@ -209,13 +209,10 @@ namespace OpenSim.Groups | |||
| 209 | public void SetAgentActiveGroup(string AgentID, GroupMembershipDelegate d) | 209 | public void SetAgentActiveGroup(string AgentID, GroupMembershipDelegate d) |
| 210 | { | 210 | { |
| 211 | GroupMembershipData activeGroup = d(); | 211 | GroupMembershipData activeGroup = d(); |
| 212 | if (activeGroup != null) | 212 | string cacheKey = "active-" + AgentID.ToString(); |
| 213 | { | 213 | lock (m_Cache) |
| 214 | string cacheKey = "active-" + AgentID.ToString(); | 214 | if (m_Cache.Contains(cacheKey)) |
| 215 | lock (m_Cache) | 215 | m_Cache.AddOrUpdate(cacheKey, activeGroup, GROUPS_CACHE_TIMEOUT); |
| 216 | if (m_Cache.Contains(cacheKey)) | ||
| 217 | m_Cache.AddOrUpdate(cacheKey, activeGroup, GROUPS_CACHE_TIMEOUT); | ||
| 218 | } | ||
| 219 | } | 216 | } |
| 220 | 217 | ||
| 221 | public ExtendedGroupMembershipData GetAgentActiveMembership(string AgentID, GroupMembershipDelegate d) | 218 | public ExtendedGroupMembershipData GetAgentActiveMembership(string AgentID, GroupMembershipDelegate d) |