diff options
| author | teravus | 2012-11-15 09:46:41 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 09:46:41 -0500 |
| commit | dfac269032300872c4d0dc507f4f9062d102b0f4 (patch) | |
| tree | d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Data/Null/NullRegionData.cs | |
| parent | * Fixes mesh loading issues in last commit. (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz | |
Merge master into teravuswork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/Null/NullRegionData.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs index deb50cb..b4d701a 100644 --- a/OpenSim/Data/Null/NullRegionData.cs +++ b/OpenSim/Data/Null/NullRegionData.cs | |||
| @@ -33,6 +33,7 @@ using OpenSim.Framework; | |||
| 33 | using OpenSim.Data; | 33 | using OpenSim.Data; |
| 34 | using System.Reflection; | 34 | using System.Reflection; |
| 35 | using log4net; | 35 | using log4net; |
| 36 | using RegionFlags = OpenSim.Framework.RegionFlags; | ||
| 36 | 37 | ||
| 37 | namespace OpenSim.Data.Null | 38 | namespace OpenSim.Data.Null |
| 38 | { | 39 | { |