diff options
| author | Melanie | 2012-10-12 19:05:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-12 19:05:06 +0100 |
| commit | 6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4 (patch) | |
| tree | d81136f8cc2c602d5cc6b783e5cb3d23343a089e /OpenSim/Data/MySQL | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: only use native sphere shape if it is a sphere. (diff) | |
| download | opensim-SC-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.zip opensim-SC-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.gz opensim-SC-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.bz2 opensim-SC-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Data/MySQL')
| -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 | { |