aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorCharles Krinke2009-05-12 03:30:37 +0000
committerCharles Krinke2009-05-12 03:30:37 +0000
commitc1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee (patch)
treeff2c7eb3d841bceb24dc01fa4d8e8c5261f33a5e /OpenSim/Data/MySQL
parentChanges to the new user system to add the modularity developed for the asset (diff)
downloadopensim-SC_OLD-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.zip
opensim-SC_OLD-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.tar.gz
opensim-SC_OLD-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.tar.bz2
opensim-SC_OLD-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.tar.xz
Thank you kindly, Patnad, for a patch that:
This is to handle the changes in the v1.23 viewer of LL regarding the adult rating. With this patch a region can be changed to the adult rating from LL viewer v1.23 and above.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs6
-rw-r--r--OpenSim/Data/MySQL/Resources/002_GridStore.sql5
2 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index ad022a5..139d57f 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -436,6 +436,7 @@ namespace OpenSim.Data.MySQL
436 // World Map Addition 436 // World Map Addition
437 UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID); 437 UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
438 UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); 438 UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
439 retval.maturity = Convert.ToUInt32(reader["access"]);
439 } 440 }
440 else 441 else
441 { 442 {
@@ -976,13 +977,13 @@ namespace OpenSim.Data.MySQL
976 // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql, 977 // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql,
977 // as well as the related parameterization 978 // as well as the related parameterization
978 sql += 979 sql +=
979 "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID) VALUES "; 980 "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID, access) VALUES ";
980 981
981 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, "; 982 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
982 sql += 983 sql +=
983 "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, "; 984 "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
984 sql += 985 sql +=
985 "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid, ?originUUID)"; 986 "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid, ?originUUID, ?access)";
986 987
987 if (GRID_ONLY_UPDATE_NECESSARY_DATA) 988 if (GRID_ONLY_UPDATE_NECESSARY_DATA)
988 { 989 {
@@ -1023,6 +1024,7 @@ namespace OpenSim.Data.MySQL
1023 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString(); 1024 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
1024 parameters["?owner_uuid"] = regiondata.owner_uuid.ToString(); 1025 parameters["?owner_uuid"] = regiondata.owner_uuid.ToString();
1025 parameters["?originUUID"] = regiondata.originUUID.ToString(); 1026 parameters["?originUUID"] = regiondata.originUUID.ToString();
1027 parameters["?access"] = regiondata.maturity.ToString();
1026 1028
1027 bool returnval = false; 1029 bool returnval = false;
1028 1030
diff --git a/OpenSim/Data/MySQL/Resources/002_GridStore.sql b/OpenSim/Data/MySQL/Resources/002_GridStore.sql
new file mode 100644
index 0000000..bda43d0
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_GridStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3ALTER TABLE regions add column access integer unsigned default 1;
4
5COMMIT;