diff options
| author | Justin Clark-Casey (justincc) | 2012-01-27 23:14:34 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-27 23:14:34 +0000 |
| commit | abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef (patch) | |
| tree | 74506e8e519bdf13305ca595b4a74eed7952c6a4 /OpenSim/Framework | |
| parent | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ... (diff) | |
| parent | HG Inventoty: Guard against items not found. (diff) | |
| download | opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.zip opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.gz opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.bz2 opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 2a495b0..98604f2 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
| @@ -373,5 +373,11 @@ namespace OpenSim.Framework | |||
| 373 | 373 | ||
| 374 | return l_EstateAccess.Contains(user); | 374 | return l_EstateAccess.Contains(user); |
| 375 | } | 375 | } |
| 376 | |||
| 377 | public bool GroupAccess(UUID groupID) | ||
| 378 | { | ||
| 379 | return l_EstateGroups.Contains(groupID); | ||
| 380 | } | ||
| 381 | |||
| 376 | } | 382 | } |
| 377 | } | 383 | } |