diff options
| author | Melanie | 2010-01-16 00:05:08 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-16 00:05:08 +0000 |
| commit | 10f8c2ea9b67158c32b361f9652d503ea48de292 (patch) | |
| tree | be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/Framework/Constants.cs | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| parent | Add "create user" instructions to README.txt (diff) | |
| download | opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.zip opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2 opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz | |
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Constants.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index 632431f..5757061 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs | |||
| @@ -36,10 +36,10 @@ namespace OpenSim.Framework | |||
| 36 | 36 | ||
| 37 | public enum EstateAccessCodex : uint | 37 | public enum EstateAccessCodex : uint |
| 38 | { | 38 | { |
| 39 | AccessOptions = 17, | 39 | AccessOptions = 1, |
| 40 | AllowedGroups = 18, | 40 | AllowedGroups = 2, |
| 41 | EstateBans = 20, | 41 | EstateBans = 4, |
| 42 | EstateManagers = 24 | 42 | EstateManagers = 8 |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | [Flags]public enum TeleportFlags : uint | 45 | [Flags]public enum TeleportFlags : uint |