From c8b392508505f49aee01fecd1648774b7131a268 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 7 Jun 2017 18:04:02 +0100 Subject: remove nonsense SendPeriodicAppearanceUpdates. if we need such a thing, then a lot is broken. Remove duplicated CleanTempObjects() call, rename BackupWaitCallback thread as BackupWorker ( still didn't found cause for mantis 8783) --- OpenSim/Region/Framework/Scenes/Scene.cs | 34 ++++------------------ .../World/SceneCommands/SceneCommandsModule.cs | 12 -------- 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 826cda1..bc2630f 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -258,11 +258,6 @@ namespace OpenSim.Region.Framework.Scenes public bool m_useTrashOnDelete = true; /// - /// Temporarily setting to trigger appearance resends at 60 second intervals. - /// - public bool SendPeriodicAppearanceUpdates { get; set; } - - /// /// How much a root agent has to change position before updates are sent to viewers. /// public float RootPositionUpdateTolerance { get; set; } @@ -1147,17 +1142,6 @@ namespace OpenSim.Region.Framework.Scenes } - - // FIXME: Ultimately this should be in a module. - SendPeriodicAppearanceUpdates = false; - - IConfig appearanceConfig = m_config.Configs["Appearance"]; - if (appearanceConfig != null) - { - SendPeriodicAppearanceUpdates - = appearanceConfig.GetBoolean("ResendAppearanceUpdates", SendPeriodicAppearanceUpdates); - } - #endregion Region Config IConfig entityTransferConfig = m_config.Configs["EntityTransfer"]; @@ -1715,16 +1699,7 @@ namespace OpenSim.Region.Framework.Scenes }); } - if (SendPeriodicAppearanceUpdates && MaintenanceRun % 60 == 0) - { - // m_log.DebugFormat("[SCENE]: Sending periodic appearance updates"); - - if (AvatarFactory != null) - { - ForEachRootScenePresence(sp => AvatarFactory.SendAppearance(sp.UUID)); - } - } - +/* this is done on heartbeat // Delete temp-on-rez stuff if (MaintenanceRun % m_update_temp_cleaning == 0 && !m_cleaningTemps) { @@ -1739,7 +1714,7 @@ namespace OpenSim.Region.Framework.Scenes tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpMS); } - +*/ Watchdog.UpdateThread(); previousMaintenanceTick = m_lastMaintenanceTick; @@ -1864,7 +1839,8 @@ namespace OpenSim.Region.Framework.Scenes if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps) { m_cleaningTemps = true; - Util.FireAndForget(delegate { CleanTempObjects(); m_cleaningTemps = false; }); + WorkManager.RunInThread( + delegate { CleanTempObjects(); m_cleaningTemps = false; }, null, string.Format("CleanTempObjects ({0})", Name)); tmpMS2 = Util.GetTimeStampMS(); tempOnRezMS = (float)(tmpMS2 - tmpMS); // bad.. counts the FireAndForget, not CleanTempObjects tmpMS = tmpMS2; @@ -2091,7 +2067,7 @@ namespace OpenSim.Region.Framework.Scenes if (!m_backingup) { m_backingup = true; - WorkManager.RunInThread(o => Backup(false), null, string.Format("BackupWaitCallback ({0})", Name)); + WorkManager.RunInThread(o => Backup(false), null, string.Format("BackupWorker ({0})", Name)); } } diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs index d0d726c..45edbda 100644 --- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs @@ -96,7 +96,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments "List current scene options.", "active - if false then main scene update and maintenance loops are suspended.\n" + "animations - if true then extra animations debug information is logged.\n" - + "appear-refresh - if true then appearance is resent to other avatars every 60 seconds.\n" + "client-pos-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" + "client-rot-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" + "client-vel-upd - the tolerance before clients are updated with new velocity information for an avatar.\n" @@ -117,7 +116,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments "Turn on scene debugging options.", "active - if false then main scene update and maintenance loops are suspended.\n" + "animations - if true then extra animations debug information is logged.\n" - + "appear-refresh - if true then appearance is resent to other avatars every 60 seconds.\n" + "client-pos-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" + "client-rot-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" + "client-vel-upd - the tolerance before clients are updated with new velocity information for an avatar.\n" @@ -153,7 +151,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments ConsoleDisplayList cdl = new ConsoleDisplayList(); cdl.AddRow("active", m_scene.Active); cdl.AddRow("animations", m_scene.DebugAnimations); - cdl.AddRow("appear-refresh", m_scene.SendPeriodicAppearanceUpdates); cdl.AddRow("client-pos-upd", m_scene.RootPositionUpdateTolerance); cdl.AddRow("client-rot-upd", m_scene.RootRotationUpdateTolerance); cdl.AddRow("client-vel-upd", m_scene.RootVelocityUpdateTolerance); @@ -207,15 +204,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments m_scene.DebugAnimations = active; } - if (options.ContainsKey("appear-refresh")) - { - bool newValue; - - // FIXME: This can only come from the console at the moment but might not always be true. - if (ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, options["appear-refresh"], out newValue)) - m_scene.SendPeriodicAppearanceUpdates = newValue; - } - if (options.ContainsKey("client-pos-upd")) { float newValue; -- cgit v1.1