From 0d7663511339801561eb34d797039e27a9974156 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 9 Jun 2020 19:44:57 +0100 Subject: [PATCH] do store a new flag on region db --- OpenSim/Data/MySQL/Resources/EstateStore.migrations | 5 +++++ OpenSim/Data/PGSQL/Resources/EstateStore.migrations | 6 ++++++ OpenSim/Data/SQLite/Resources/EstateStore.migrations | 6 ++++++ OpenSim/Framework/EstateSettings.cs | 7 ++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations index 37f8cfd275..d0c9caf1a0 100644 --- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations +++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations @@ -76,3 +76,8 @@ ALTER TABLE `estateban` ADD COLUMN `banTime` int(11) NOT NULL DEFAULT 0; COMMIT; +:VERSION 36 +BEGIN; +ALTER TABLE `estate_settings` + ADD COLUMN `AllowEnviromentOverride` tinyint(4) NOT NULL DEFAULT '0'; +COMMIT; diff --git a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations index d0730bb2f7..a1852d55f9 100644 --- a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations @@ -133,3 +133,9 @@ ALTER TABLE "public"."estateban" ADD COLUMN "banningUUID" uuid NOT NULL, ADD COLUMN "banTime" int4 NOT NULL DEFAULT 0; COMMIT; + +:VERSION 15 +BEGIN TRANSACTION; +ALTER TABLE "public"."estate_settings" + ADD COLUMN "AllowEnviromentOverride" bool NOT NULL; +COMMIT; \ No newline at end of file diff --git a/OpenSim/Data/SQLite/Resources/EstateStore.migrations b/OpenSim/Data/SQLite/Resources/EstateStore.migrations index b165b7bf7d..4818f97702 100644 --- a/OpenSim/Data/SQLite/Resources/EstateStore.migrations +++ b/OpenSim/Data/SQLite/Resources/EstateStore.migrations @@ -74,4 +74,10 @@ ALTER TABLE `estateban` ADD COLUMN `banningUUID` varchar(36) NOT NULL DEFAULT '0 ALTER TABLE `estateban` ADD COLUMN `banTime` integer NOT NULL DEFAULT 0; COMMIT; +:VERSION 12 +BEGIN; +ALTER TABLE `estate_settings` + ADD COLUMN `AllowEnviromentOverride` tinyint not null default 0; +COMMIT; + diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index a128a2c125..4d15539365 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs @@ -237,7 +237,12 @@ namespace OpenSim.Framework set { m_DenyMinors = value; } } - public bool AllowEnviromentOverride {get; set;} = false; + private bool m_AllowEnviromentOverride = false; + public bool AllowEnviromentOverride + { + get { return m_AllowEnviromentOverride; } + set { m_AllowEnviromentOverride = value; } + } // All those lists... //