From 6a75b7c65e0b7f756e180bb2c46f44b467be2a63 Mon Sep 17 00:00:00 2001 From: TomTheDragon Date: Sat, 11 Nov 2017 19:44:17 -0500 Subject: [PATCH 1/3] PGSQL EstateStore create estate_settings_id SEQUENCE Missing creation for estate_settings_id sequence causes first run to fail unless manually added. Signed-off-by: UbitUmarov --- OpenSim/Data/PGSQL/Resources/EstateStore.migrations | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations index 63b70bd555..4dbc59ff0b 100644 --- a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations @@ -2,6 +2,16 @@ BEGIN TRANSACTION; +-- ---------------------------- +-- SEQUENCE estate_settings_id +-- ---------------------------- +CREATE SEQUENCE IF NOT EXISTS "public"."estate_settings_id" + INCREMENT 100 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 100 + CACHE 1; + -- ---------------------------- -- Table structure for estate_groups -- ---------------------------- From f2b54c8cf93e20abad33043c3f1d7fc1407f3097 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 12 Nov 2017 09:16:32 +0000 Subject: [PATCH 2/3] mantis 8200: move changes in PGSQL from last commit to a new transaction (13) --- .../PGSQL/Resources/EstateStore.migrations | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations index 4dbc59ff0b..5b450aa45f 100644 --- a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations @@ -2,16 +2,6 @@ BEGIN TRANSACTION; --- ---------------------------- --- SEQUENCE estate_settings_id --- ---------------------------- -CREATE SEQUENCE IF NOT EXISTS "public"."estate_settings_id" - INCREMENT 100 - MINVALUE 1 - MAXVALUE 9223372036854775807 - START 100 - CACHE 1; - -- ---------------------------- -- Table structure for estate_groups -- ---------------------------- @@ -120,3 +110,18 @@ CREATE INDEX IF NOT EXISTS "ix_estateban" ON "public"."estateban" USING btree(" COMMIT; +:VERSION 13 + + BEGIN TRASACTION; + +-- ---------------------------- +-- SEQUENCE estate_settings_id +-- ---------------------------- +CREATE SEQUENCE IF NOT EXISTS "public"."estate_settings_id" + INCREMENT 100 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 100 + CACHE 1; + +COMMIT; From 6546ea6da642f9b4c8bb03ee7e43741352820bd9 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 12 Nov 2017 12:00:03 +0000 Subject: [PATCH 3/3] mantis 8253: don't let attachments delete remove controls from viewers on crossings. --- .../Framework/EntityTransfer/EntityTransferModule.cs | 4 +++- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 9b094f7bdc..d51b9da795 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -1178,6 +1178,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; agent.SenderWantsToWaitForRoot = true; + //SetCallbackURL(agent, sp.Scene.RegionInfo); // Reset the do not close flag. This must be done before the destination opens child connections (here @@ -1877,7 +1878,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if(childRegionsToClose != null) agent.CloseChildAgents(childRegionsToClose); - // this may need the attachments + if((agent.crossingFlags & 8) == 0) + agent.ClearControls(); // don't let attachments delete (called in HasMovedAway) disturb taken controls on viewers agent.HasMovedAway((agent.crossingFlags & 8) == 0); diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 059a846e82..018c2e2c53 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2288,13 +2288,6 @@ namespace OpenSim.Region.Framework.Scenes } } - if(gotCrossUpdate) - { - if(IgnoredControls != ScriptControlled.CONTROL_ZERO) - ControllingClient.SendTakeControls((int)IgnoredControls, false, true); - - } - m_log.DebugFormat("[CompleteMovement] attachments: {0}ms", Util.EnvironmentTickCountSubtract(ts)); if (openChildAgents) { @@ -5685,7 +5678,6 @@ namespace OpenSim.Region.Framework.Scenes { IgnoredControls = ScriptControlled.CONTROL_ZERO; obj.eventControls = (ScriptControlled)controls; - obj.ignoreControls = ScriptControlled.CONTROL_ZERO; } lock (scriptedcontrols) @@ -5801,7 +5793,7 @@ namespace OpenSim.Region.Framework.Scenes { if (scriptedcontrols.TryGetValue(Script_item_UUID, out takecontrols)) { - ScriptControlled sctc = takecontrols.eventControls; + ScriptControlled sctc = takecontrols.eventControls; ControllingClient.SendTakeControls((int)sctc, false, false); ControllingClient.SendTakeControls((int)sctc, true, false);