diff options
| author | teravus | 2012-11-15 10:05:16 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 10:05:16 -0500 |
| commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
| tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Data/Null | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz | |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/Null/NullRegionData.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs index b4d701a..deb50cb 100644 --- a/OpenSim/Data/Null/NullRegionData.cs +++ b/OpenSim/Data/Null/NullRegionData.cs | |||
| @@ -33,7 +33,6 @@ 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; | ||
| 37 | 36 | ||
| 38 | namespace OpenSim.Data.Null | 37 | namespace OpenSim.Data.Null |
| 39 | { | 38 | { |