aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-03 21:36:00 +0100
committerJustin Clark-Casey (justincc)2012-08-03 21:36:00 +0100
commit789e88d8bd2a4e67623faec548db5389cc8fe918 (patch)
treed38f8587422b3694af1a763636145de8d12b6aee
parentrefactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,... (diff)
downloadopensim-SC_OLD-789e88d8bd2a4e67623faec548db5389cc8fe918.zip
opensim-SC_OLD-789e88d8bd2a4e67623faec548db5389cc8fe918.tar.gz
opensim-SC_OLD-789e88d8bd2a4e67623faec548db5389cc8fe918.tar.bz2
opensim-SC_OLD-789e88d8bd2a4e67623faec548db5389cc8fe918.tar.xz
Move previously unadvertised SendPeriodicAppearanceUpdates setting from [Startup] to [Appearance] config section.
Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
-rw-r--r--bin/OpenSimDefaults.ini9
2 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c77457c..40cfb72 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -814,8 +814,14 @@ namespace OpenSim.Region.Framework.Scenes
814 m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences); 814 m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences);
815 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); 815 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain);
816 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); 816 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning);
817 }
817 818
818 SendPeriodicAppearanceUpdates = startupConfig.GetBoolean("SendPeriodicAppearanceUpdates", SendPeriodicAppearanceUpdates); 819 // FIXME: Ultimately this should be in a module.
820 IConfig appearanceConfig = m_config.Configs["Appearance"];
821 if (appearanceConfig != null)
822 {
823 SendPeriodicAppearanceUpdates
824 = appearanceConfig.GetBoolean("ResendAppearanceUpdates", SendPeriodicAppearanceUpdates);
819 } 825 }
820 826
821 #endregion Region Config 827 #endregion Region Config
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ff5bdec..ab153a5 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -341,7 +341,6 @@
341 ; OpenJPEG if false 341 ; OpenJPEG if false
342 ; UseCSJ2K = true 342 ; UseCSJ2K = true
343 343
344
345 ; Use "Trash" folder for items deleted from the scene 344 ; Use "Trash" folder for items deleted from the scene
346 ; When set to True (the default) items deleted from the scene will be 345 ; When set to True (the default) items deleted from the scene will be
347 ; stored in the user's trash or lost and found folder. When set to 346 ; stored in the user's trash or lost and found folder. When set to
@@ -671,6 +670,14 @@
671 CoalesceMultipleObjectsToInventory = true 670 CoalesceMultipleObjectsToInventory = true
672 671
673 672
673[Appearance]
674 ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds.
675 ; This may help with some situations where avatars are persistently grey, though it will not help
676 ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).
677 ; This setting is experimental.
678 ResendAppearanceUpdates = false
679
680
674[Attachments] 681[Attachments]
675 ; Controls whether avatar attachments are enabled. 682 ; Controls whether avatar attachments are enabled.
676 ; Defaults to true - only set to false for debugging purposes 683 ; Defaults to true - only set to false for debugging purposes