diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c77457c764..40cfb72bd7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -814,8 +814,14 @@ namespace OpenSim.Region.Framework.Scenes m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences); m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); + } - SendPeriodicAppearanceUpdates = startupConfig.GetBoolean("SendPeriodicAppearanceUpdates", SendPeriodicAppearanceUpdates); + // FIXME: Ultimately this should be in a module. + IConfig appearanceConfig = m_config.Configs["Appearance"]; + if (appearanceConfig != null) + { + SendPeriodicAppearanceUpdates + = appearanceConfig.GetBoolean("ResendAppearanceUpdates", SendPeriodicAppearanceUpdates); } #endregion Region Config diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ff5bdec32e..ab153a5518 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -341,7 +341,6 @@ ; OpenJPEG if false ; UseCSJ2K = true - ; Use "Trash" folder for items deleted from the scene ; When set to True (the default) items deleted from the scene will be ; stored in the user's trash or lost and found folder. When set to @@ -671,6 +670,14 @@ CoalesceMultipleObjectsToInventory = true +[Appearance] + ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds. + ; This may help with some situations where avatars are persistently grey, though it will not help + ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). + ; This setting is experimental. + ResendAppearanceUpdates = false + + [Attachments] ; Controls whether avatar attachments are enabled. ; Defaults to true - only set to false for debugging purposes