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/MySQL/MySQLRegionData.cs | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC_OLD-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/MySQL/MySQLRegionData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index a2d4ae4..0614879 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
| @@ -30,11 +30,11 @@ using System.Collections; | |||
| 30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
| 31 | using System.Data; | 31 | using System.Data; |
| 32 | using System.Reflection; | 32 | using System.Reflection; |
| 33 | using MySql.Data.MySqlClient; | 33 | |
| 34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
| 36 | using OpenSim.Data; | 36 | using OpenSim.Data; |
| 37 | using RegionFlags = OpenSim.Framework.RegionFlags; | 37 | using MySql.Data.MySqlClient; |
| 38 | 38 | ||
| 39 | namespace OpenSim.Data.MySQL | 39 | namespace OpenSim.Data.MySQL |
| 40 | { | 40 | { |