diff options
| author | Melanie | 2012-01-26 23:07:31 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 23:07:31 +0000 |
| commit | 9d60b84f7805b78ae9413b4dc66c2fbbf387e503 (patch) | |
| tree | 6aa89951925561a5dbe031b9a92e9dd49c0a272a /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.zip opensim-SC_OLD-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.gz opensim-SC_OLD-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.bz2 opensim-SC_OLD-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/EstateSettings.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index afbdd49..142b783 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
| @@ -425,5 +425,11 @@ namespace OpenSim.Framework | |||
| 425 | AllowParcelChanges = ((regionFlags & (ulong)RegionFlags.AllowParcelChanges) == (ulong)RegionFlags.AllowParcelChanges); | 425 | AllowParcelChanges = ((regionFlags & (ulong)RegionFlags.AllowParcelChanges) == (ulong)RegionFlags.AllowParcelChanges); |
| 426 | AllowSetHome = ((regionFlags & (ulong)RegionFlags.AllowSetHome) == (ulong)RegionFlags.AllowSetHome); | 426 | AllowSetHome = ((regionFlags & (ulong)RegionFlags.AllowSetHome) == (ulong)RegionFlags.AllowSetHome); |
| 427 | } | 427 | } |
| 428 | |||
| 429 | public bool GroupAccess(UUID groupID) | ||
| 430 | { | ||
| 431 | return l_EstateGroups.Contains(groupID); | ||
| 432 | } | ||
| 433 | |||
| 428 | } | 434 | } |
| 429 | } | 435 | } |