diff options
| author | Justin Clark-Casey (justincc) | 2012-10-09 01:35:27 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-09 01:35:27 +0100 |
| commit | 73c9abf5f2e2017bf924d6183502e337d28a7232 (patch) | |
| tree | 07fd1ab2e9aef88412f37d8023bb7a903bb79047 /OpenSim/Region/CoreModules/World | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC_OLD-73c9abf5f2e2017bf924d6183502e337d28a7232.zip opensim-SC_OLD-73c9abf5f2e2017bf924d6183502e337d28a7232.tar.gz opensim-SC_OLD-73c9abf5f2e2017bf924d6183502e337d28a7232.tar.bz2 opensim-SC_OLD-73c9abf5f2e2017bf924d6183502e337d28a7232.tar.xz | |
Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 58bbd24..0e6d663 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -39,6 +39,7 @@ using OpenMetaverse; | |||
| 39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
| 40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
| 41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
| 42 | using RegionFlags = OpenMetaverse.RegionFlags; | ||
| 42 | 43 | ||
| 43 | namespace OpenSim.Region.CoreModules.World.Estate | 44 | namespace OpenSim.Region.CoreModules.World.Estate |
| 44 | { | 45 | { |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 0536f6e..8829f27 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -33,6 +33,7 @@ using OpenMetaverse; | |||
| 33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
| 34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
| 35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
| 36 | using RegionFlags = OpenMetaverse.RegionFlags; | ||
| 36 | 37 | ||
| 37 | namespace OpenSim.Region.CoreModules.World.Land | 38 | namespace OpenSim.Region.CoreModules.World.Land |
| 38 | { | 39 | { |