ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
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
This commit is contained in:
Melanie
2012-04-07 04:52:14 +01:00
parent 6378abb966 806082cd6e
commit b39de2425c
27 changed files with 963 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -464,7 +464,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
if (d.GroupID == LandData.GroupID)
{
m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
m_groupMemberCache.Add(avatar, true, m_groupMemberCacheTimeout);
return true;
}
}
@@ -472,10 +472,7 @@ namespace OpenSim.Region.CoreModules.World.Land
return false;
}
if (!sp.ControllingClient.IsGroupMember(LandData.GroupID))
return false;
return true;
return sp.ControllingClient.IsGroupMember(LandData.GroupID);
}
return false;
}