diff options
| author | Melanie | 2013-06-06 03:20:15 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-06 03:20:15 +0100 |
| commit | fe4a67efb6f54cad3f00884712abe03704216421 (patch) | |
| tree | 04de93aaa8e9430c7c33e15912b3683b0297a10a /OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Update HTTP server (diff) | |
| download | opensim-SC-fe4a67efb6f54cad3f00884712abe03704216421.zip opensim-SC-fe4a67efb6f54cad3f00884712abe03704216421.tar.gz opensim-SC-fe4a67efb6f54cad3f00884712abe03704216421.tar.bz2 opensim-SC-fe4a67efb6f54cad3f00884712abe03704216421.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs b/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs index 08b71e4..4d000b6 100644 --- a/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs | |||
| @@ -43,6 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 43 | public enum UserMode : int | 43 | public enum UserMode : int |
| 44 | { | 44 | { |
| 45 | Normal = 0, | 45 | Normal = 0, |
| 46 | RegionManager = 2, | ||
| 46 | God = 3 | 47 | God = 3 |
| 47 | } | 48 | } |
| 48 | 49 | ||