diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 3a28d42..a8594e4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -842,7 +842,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
842 | m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences); | 842 | m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences); |
843 | m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); | 843 | m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); |
844 | m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); | 844 | m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); |
845 | SendPeriodicAppearanceUpdates = startupConfig.GetBoolean("SendPeriodicAppearanceUpdates", SendPeriodicAppearanceUpdates); | ||
846 | } | 845 | } |
847 | } | 846 | } |
848 | catch (Exception e) | 847 | catch (Exception e) |
@@ -850,6 +849,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
850 | m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString()); | 849 | m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString()); |
851 | } | 850 | } |
852 | 851 | ||
852 | // FIXME: Ultimately this should be in a module. | ||
853 | IConfig appearanceConfig = m_config.Configs["Appearance"]; | ||
854 | if (appearanceConfig != null) | ||
855 | { | ||
856 | SendPeriodicAppearanceUpdates | ||
857 | = appearanceConfig.GetBoolean("ResendAppearanceUpdates", SendPeriodicAppearanceUpdates); | ||
858 | } | ||
859 | |||
853 | #endregion Region Config | 860 | #endregion Region Config |
854 | 861 | ||
855 | #region Interest Management | 862 | #region Interest Management |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index d51281d..d837adb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -951,7 +951,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
951 | /// its existing localID and UUID. | 951 | /// its existing localID and UUID. |
952 | /// </summary> | 952 | /// </summary> |
953 | /// <param name='part'>Root part for this scene object.</param> | 953 | /// <param name='part'>Root part for this scene object.</param> |
954 | public SceneObjectGroup(SceneObjectPart part) | 954 | public SceneObjectGroup(SceneObjectPart part) : this() |
955 | { | 955 | { |
956 | SetRootPart(part); | 956 | SetRootPart(part); |
957 | } | 957 | } |