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

add storage for pbr terrain feature that viewers for opensim may add

Browse Source
This commit is contained in:
UbitUmarov
2024-06-08 21:58:46 +01:00
parent ecdc979687
commit 54fe5747ea
13 changed files with 201 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@@ -901,7 +901,8 @@ namespace OpenSim.Data.MySQL
"covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
"sunvectorz, loaded_creation_datetime, " +
"loaded_creation_id, map_tile_ID, block_search, casino, " +
"TelehubObject, parcel_tile_ID, cacheID) " +
"TelehubObject, parcel_tile_ID, cacheID, " +
"TerrainPBR1, TerrainPBR2, TerrainPBR3, TerrainPBR4)" +
"values (?RegionUUID, ?BlockTerraform, " +
"?BlockFly, ?AllowDamage, ?RestrictPushing, " +
"?AllowLandResell, ?AllowLandJoinDivide, " +
@@ -918,7 +919,8 @@ namespace OpenSim.Data.MySQL
"?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
"?loaded_creation_datetime, ?loaded_creation_id, " +
"?map_tile_ID, ?block_search, ?casino, " +
"?TelehubObject, ?parcel_tile_ID, ?cacheID)";
"?TelehubObject, ?parcel_tile_ID, ?cacheID, " +
"?TerrainPBR1, ?TerrainPBR2, ?TerrainPBR3, ?TerrainPBR4)";
FillRegionSettingsCommand(cmd, rs);
ExecuteNonQuery(cmd);
@@ -1298,6 +1300,11 @@ namespace OpenSim.Data.MySQL
if (row["cacheID"] is not DBNull)
newSettings.CacheID = DBGuid.FromDB(row["cacheID"]);
newSettings.TerrainPBR1 = DBGuid.FromDB(row["TerrainPBR1"]);
newSettings.TerrainPBR2 = DBGuid.FromDB(row["TerrainPBR2"]);
newSettings.TerrainPBR3 = DBGuid.FromDB(row["TerrainPBR3"]);
newSettings.TerrainPBR4 = DBGuid.FromDB(row["TerrainPBR4"]);
return newSettings;
}
@@ -1700,6 +1707,11 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("parcel_tile_ID", settings.ParcelImageID.ToString());
cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject.ToString());
cmd.Parameters.AddWithValue("cacheID", settings.CacheID.ToString());
cmd.Parameters.AddWithValue("TerrainPBR1", settings.TerrainPBR1.ToString());
cmd.Parameters.AddWithValue("TerrainPBR2", settings.TerrainPBR2.ToString());
cmd.Parameters.AddWithValue("TerrainPBR3", settings.TerrainPBR3.ToString());
cmd.Parameters.AddWithValue("TerrainPBR4", settings.TerrainPBR4.ToString());
}
/// <summary>

8
OpenSim/Data/MySQL/Resources/RegionStore.migrations
View File

@@ -558,4 +558,12 @@ COMMIT;
:VERSION 65 #----- add linkset data binary storage column
BEGIN;
ALTER TABLE `prims` ADD COLUMN `lnkstBinData` blob default NULL;
COMMIT;
:VERSION 66 #----- add PBR Terrain storage column
BEGIN;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` varchar(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` varchar(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` varchar(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` varchar(36) NOT NULL;
COMMIT;