diff options
author | Charles Krinke | 2009-05-17 18:18:48 +0000 |
---|---|---|
committer | Charles Krinke | 2009-05-17 18:18:48 +0000 |
commit | 7a8a481f8801d9840a9ec05dd18adb2a1ccaebf7 (patch) | |
tree | 2b8d4a2dac75de73ef32e9ea8631a939d3090233 /OpenSim/Data/MSSQL/MSSQLGridData.cs | |
parent | Thank you kindly, Jonc, for a patch that solves (diff) | |
download | opensim-SC-7a8a481f8801d9840a9ec05dd18adb2a1ccaebf7.zip opensim-SC-7a8a481f8801d9840a9ec05dd18adb2a1ccaebf7.tar.gz opensim-SC-7a8a481f8801d9840a9ec05dd18adb2a1ccaebf7.tar.bz2 opensim-SC-7a8a481f8801d9840a9ec05dd18adb2a1ccaebf7.tar.xz |
Thank you kindly, StrawberryFride, for a patch that:
Adds maturity & access logic for MSSQL platform to
mirror that of MySQL as committed in 9502.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLGridData.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs index 027796a..c7e5ec8 100644 --- a/OpenSim/Data/MSSQL/MSSQLGridData.cs +++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs | |||
@@ -445,9 +445,7 @@ namespace OpenSim.Data.MSSQL | |||
445 | // World Map Addition | 445 | // World Map Addition |
446 | retval.regionMapTextureID = new UUID((Guid)reader["regionMapTexture"]); | 446 | retval.regionMapTextureID = new UUID((Guid)reader["regionMapTexture"]); |
447 | retval.owner_uuid = new UUID((Guid)reader["owner_uuid"]); | 447 | retval.owner_uuid = new UUID((Guid)reader["owner_uuid"]); |
448 | // UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID); | 448 | retval.maturity = Convert.ToUInt32(reader["access"]); |
449 | // UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); | ||
450 | |||
451 | return retval; | 449 | return retval; |
452 | } | 450 | } |
453 | 451 | ||
@@ -535,11 +533,11 @@ namespace OpenSim.Data.MSSQL | |||
535 | [serverIP], [serverPort], [serverURI], [locX], [locY], [locZ], [eastOverrideHandle], [westOverrideHandle], | 533 | [serverIP], [serverPort], [serverURI], [locX], [locY], [locZ], [eastOverrideHandle], [westOverrideHandle], |
536 | [southOverrideHandle], [northOverrideHandle], [regionAssetURI], [regionAssetRecvKey], [regionAssetSendKey], | 534 | [southOverrideHandle], [northOverrideHandle], [regionAssetURI], [regionAssetRecvKey], [regionAssetSendKey], |
537 | [regionUserURI], [regionUserRecvKey], [regionUserSendKey], [regionMapTexture], [serverHttpPort], | 535 | [regionUserURI], [regionUserRecvKey], [regionUserSendKey], [regionMapTexture], [serverHttpPort], |
538 | [serverRemotingPort], [owner_uuid], [originUUID]) | 536 | [serverRemotingPort], [owner_uuid], [originUUID], [access]) |
539 | VALUES (@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, | 537 | VALUES (@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, |
540 | @serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, | 538 | @serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, |
541 | @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, @regionAssetSendKey, | 539 | @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, @regionAssetSendKey, |
542 | @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort, @owner_uuid, @originUUID);"; | 540 | @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort, @owner_uuid, @originUUID, @access);"; |
543 | 541 | ||
544 | using (AutoClosingSqlCommand command = database.Query(sql)) | 542 | using (AutoClosingSqlCommand command = database.Query(sql)) |
545 | { | 543 | { |
@@ -571,6 +569,7 @@ namespace OpenSim.Data.MSSQL | |||
571 | command.Parameters.Add(database.CreateParameter("serverRemotingPort", profile.remotingPort)); | 569 | command.Parameters.Add(database.CreateParameter("serverRemotingPort", profile.remotingPort)); |
572 | command.Parameters.Add(database.CreateParameter("owner_uuid", profile.owner_uuid)); | 570 | command.Parameters.Add(database.CreateParameter("owner_uuid", profile.owner_uuid)); |
573 | command.Parameters.Add(database.CreateParameter("originUUID", profile.originUUID)); | 571 | command.Parameters.Add(database.CreateParameter("originUUID", profile.originUUID)); |
572 | command.Parameters.Add(database.CreateParameter("access", profile.maturity)); | ||
574 | 573 | ||
575 | try | 574 | try |
576 | { | 575 | { |