diff options
author | Melanie | 2012-04-07 04:52:14 +0100 |
---|---|---|
committer | Melanie | 2012-04-07 04:52:14 +0100 |
commit | b39de2425cac4c2a94a7fdd6c77100ef831d66b4 (patch) | |
tree | 9258928681a82d68b408354e534c32bcf283ad3a /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
parent | Merge branch 'ubitwork' (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-b39de2425cac4c2a94a7fdd6c77100ef831d66b4.zip opensim-SC_OLD-b39de2425cac4c2a94a7fdd6c77100ef831d66b4.tar.gz opensim-SC_OLD-b39de2425cac4c2a94a7fdd6c77100ef831d66b4.tar.bz2 opensim-SC_OLD-b39de2425cac4c2a94a7fdd6c77100ef831d66b4.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 1f3f075..509c4d7 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -464,7 +464,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
464 | { | 464 | { |
465 | if (d.GroupID == LandData.GroupID) | 465 | if (d.GroupID == LandData.GroupID) |
466 | { | 466 | { |
467 | m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout); | 467 | m_groupMemberCache.Add(avatar, true, m_groupMemberCacheTimeout); |
468 | return true; | 468 | return true; |
469 | } | 469 | } |
470 | } | 470 | } |
@@ -472,10 +472,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
472 | return false; | 472 | return false; |
473 | } | 473 | } |
474 | 474 | ||
475 | if (!sp.ControllingClient.IsGroupMember(LandData.GroupID)) | 475 | return sp.ControllingClient.IsGroupMember(LandData.GroupID); |
476 | return false; | ||
477 | |||
478 | return true; | ||
479 | } | 476 | } |
480 | return false; | 477 | return false; |
481 | } | 478 | } |