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/MySQL/MySQLRegionData.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/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 0614879..a2d4ae4 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 | 33 | using MySql.Data.MySqlClient; | |
| 34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
| 36 | using OpenSim.Data; | 36 | using OpenSim.Data; |
| 37 | using MySql.Data.MySqlClient; | 37 | using RegionFlags = OpenSim.Framework.RegionFlags; |
| 38 | 38 | ||
| 39 | namespace OpenSim.Data.MySQL | 39 | namespace OpenSim.Data.MySQL |
| 40 | { | 40 | { |