Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/EstateSettings.cs
This commit is contained in:
Melanie
2012-01-26 23:07:31 +00:00
5 changed files with 89 additions and 0 deletions

View File

@@ -425,5 +425,11 @@ namespace OpenSim.Framework
AllowParcelChanges = ((regionFlags & (ulong)RegionFlags.AllowParcelChanges) == (ulong)RegionFlags.AllowParcelChanges);
AllowSetHome = ((regionFlags & (ulong)RegionFlags.AllowSetHome) == (ulong)RegionFlags.AllowSetHome);
}
public bool GroupAccess(UUID groupID)
{
return l_EstateGroups.Contains(groupID);
}
}
}