diff options
| author | Melanie | 2012-04-11 23:35:27 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-11 23:35:27 +0100 |
| commit | 4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753 (patch) | |
| tree | 28253aa39e6bf11e8f814d6818f727e5f27eb036 /OpenSim/Region/CoreModules/World/Land | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | HGFriendsModule: Type casts to fix compile error (diff) | |
| download | opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.zip opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.gz opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.bz2 opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 509c4d7..9b2ddfd 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -447,7 +447,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 447 | { | 447 | { |
| 448 | bool isMember; | 448 | bool isMember; |
| 449 | if (m_groupMemberCache.TryGetValue(avatar, out isMember)) | 449 | if (m_groupMemberCache.TryGetValue(avatar, out isMember)) |
| 450 | { | ||
| 451 | m_groupMemberCache.Update(avatar, isMember, m_groupMemberCacheTimeout); | ||
| 450 | return isMember; | 452 | return isMember; |
| 453 | } | ||
| 451 | 454 | ||
| 452 | IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>(); | 455 | IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>(); |
| 453 | if (groupsModule == null) | 456 | if (groupsModule == null) |