diff options
| author | Melanie | 2010-04-30 11:49:24 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-30 11:49:24 +0100 |
| commit | 13960b3b866679caef3f598006cccf402e165341 (patch) | |
| tree | e0fefe721da7d5bc6d168c9bcdf0a0bca2fe249a /OpenSim/Region/CoreModules/World/Permissions | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-13960b3b866679caef3f598006cccf402e165341.zip opensim-SC-13960b3b866679caef3f598006cccf402e165341.tar.gz opensim-SC-13960b3b866679caef3f598006cccf402e165341.tar.bz2 opensim-SC-13960b3b866679caef3f598006cccf402e165341.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index b0bb810..f6bb3fe 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1894,4 +1894,4 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1894 | return(false); | 1894 | return(false); |
| 1895 | } | 1895 | } |
| 1896 | } | 1896 | } |
| 1897 | } \ No newline at end of file | 1897 | } |