diff options
| author | Melanie | 2010-05-18 23:02:05 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-18 23:02:10 +0100 |
| commit | 397326ddfa5fd14b8423a152dd9ec5a471924a41 (patch) | |
| tree | 8f719ceba221fd7980b7354bb1928ae734c84fc9 /OpenSim/Data/MySQL/MySQLRegionData.cs | |
| parent | Revert "Looks like the new files were never added to prebuild.xml" (diff) | |
| parent | Some more corrections after MySQL connector update (diff) | |
| download | opensim-SC_OLD-397326ddfa5fd14b8423a152dd9ec5a471924a41.zip opensim-SC_OLD-397326ddfa5fd14b8423a152dd9ec5a471924a41.tar.gz opensim-SC_OLD-397326ddfa5fd14b8423a152dd9ec5a471924a41.tar.bz2 opensim-SC_OLD-397326ddfa5fd14b8423a152dd9ec5a471924a41.tar.xz | |
Merge commit 'alex/Migrations'
Another stab at the tests
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLRegionData.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index aa9a104..c7bddac 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
| @@ -31,6 +31,7 @@ using System.Collections.Generic; | |||
| 31 | using System.Data; | 31 | using System.Data; |
| 32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
| 33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
| 34 | using OpenSim.Data; | ||
| 34 | using MySql.Data.MySqlClient; | 35 | using MySql.Data.MySqlClient; |
| 35 | 36 | ||
| 36 | namespace OpenSim.Data.MySQL | 37 | namespace OpenSim.Data.MySQL |
| @@ -143,12 +144,9 @@ namespace OpenSim.Data.MySQL | |||
| 143 | RegionData ret = new RegionData(); | 144 | RegionData ret = new RegionData(); |
| 144 | ret.Data = new Dictionary<string, object>(); | 145 | ret.Data = new Dictionary<string, object>(); |
| 145 | 146 | ||
| 146 | UUID regionID; | 147 | ret.RegionID = DBGuid.FromDB(result["uuid"]); |
| 147 | UUID.TryParse(result["uuid"].ToString(), out regionID); | 148 | ret.ScopeID = DBGuid.FromDB(result["ScopeID"]); |
| 148 | ret.RegionID = regionID; | 149 | |
| 149 | UUID scope; | ||
| 150 | UUID.TryParse(result["ScopeID"].ToString(), out scope); | ||
| 151 | ret.ScopeID = scope; | ||
| 152 | ret.RegionName = result["regionName"].ToString(); | 150 | ret.RegionName = result["regionName"].ToString(); |
| 153 | ret.posX = Convert.ToInt32(result["locX"]); | 151 | ret.posX = Convert.ToInt32(result["locX"]); |
| 154 | ret.posY = Convert.ToInt32(result["locY"]); | 152 | ret.posY = Convert.ToInt32(result["locY"]); |