From 7a8a481f8801d9840a9ec05dd18adb2a1ccaebf7 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Sun, 17 May 2009 18:18:48 +0000 Subject: Thank you kindly, StrawberryFride, for a patch that: Adds maturity & access logic for MSSQL platform to mirror that of MySQL as committed in 9502. --- OpenSim/Data/MSSQL/MSSQLGridData.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'OpenSim/Data/MSSQL/MSSQLGridData.cs') 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 // World Map Addition 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); - + retval.maturity = Convert.ToUInt32(reader["access"]); return retval; } @@ -535,11 +533,11 @@ namespace OpenSim.Data.MSSQL [serverIP], [serverPort], [serverURI], [locX], [locY], [locZ], [eastOverrideHandle], [westOverrideHandle], [southOverrideHandle], [northOverrideHandle], [regionAssetURI], [regionAssetRecvKey], [regionAssetSendKey], [regionUserURI], [regionUserRecvKey], [regionUserSendKey], [regionMapTexture], [serverHttpPort], - [serverRemotingPort], [owner_uuid], [originUUID]) + [serverRemotingPort], [owner_uuid], [originUUID], [access]) VALUES (@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, @serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, @regionAssetSendKey, - @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort, @owner_uuid, @originUUID);"; + @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort, @owner_uuid, @originUUID, @access);"; using (AutoClosingSqlCommand command = database.Query(sql)) { @@ -571,6 +569,7 @@ namespace OpenSim.Data.MSSQL command.Parameters.Add(database.CreateParameter("serverRemotingPort", profile.remotingPort)); command.Parameters.Add(database.CreateParameter("owner_uuid", profile.owner_uuid)); command.Parameters.Add(database.CreateParameter("originUUID", profile.originUUID)); + command.Parameters.Add(database.CreateParameter("access", profile.maturity)); try { -- cgit v1.1