ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

conflict fixes

Browse Source
This commit is contained in:
Adil El Farissi
2024-07-06 21:25:39 +00:00
parent 4ece46b7a3
commit 6907ced898
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -566,5 +566,4 @@ ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` varchar(36) NOT NULL DEFAU
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
COMMIT;

2
OpenSim/Data/PGSQL/PGSQLMuteListData.cs
View File

@@ -69,4 +69,4 @@ namespace OpenSim.Data.PGSQL
}
}
}
}
}

2
OpenSim/Data/PGSQL/Resources/MuteListStore.migrations
View File

@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS MuteList (
CONSTRAINT unique_agent_2 UNIQUE ("AgentID", "MuteId", "MuteName")
);
COMMIT;
COMMIT;