ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Apply http://opensimulator.org/mantis/view.php?id=3142

Browse Source 
* Changes varchar(36) columns to UUID type in MSSQL - this will be much more efficient
* ===As always, please, please backup your database before applying this patch===
* Thanks Ruud Lathrop (for the patch) and StrawberryFride (for the review)
This commit is contained in:
Justin Clarke Casey
2009-02-19 18:09:10 +00:00
parent 06ece33bee
commit 0760956561
30 changed files with 1125 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Data/MSSQL/MSSQLGridData.cs
View File

@@ -395,17 +395,17 @@ namespace OpenSim.Data.MSSQL
retval.regionHandle = tmp64;
UUID tmp_uuid;
if (!UUID.TryParse((string)reader["uuid"], out tmp_uuid))
{
return null;
}
// UUID tmp_uuid;
// if (!UUID.TryParse((string)reader["uuid"], out tmp_uuid))
// {
// return null;
// }
retval.UUID = tmp_uuid;
retval.UUID = new UUID((Guid)reader["uuid"]); // tmp_uuid;
// non-critical parts
retval.regionName = reader["regionName"].ToString();
retval.originUUID = new UUID((string)reader["originUUID"]);
retval.originUUID = new UUID((Guid)reader["originUUID"]);
// Secrets
retval.regionRecvKey = reader["regionRecvKey"].ToString();
@@ -443,8 +443,10 @@ namespace OpenSim.Data.MSSQL
retval.regionUserSendKey = reader["regionUserSendKey"].ToString();
// World Map Addition
UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
retval.regionMapTextureID = new UUID((Guid)reader["regionMapTexture"]);
retval.owner_uuid = new UUID((Guid)reader["owner_uuid"]);
// UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
// UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
return retval;
}