ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2012-08-04 03:00:20 +01:00
parent 0c00abcce1 374ebab574
commit b9c4a637b4
18 changed files with 215 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -842,7 +842,6 @@ 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);
}
}
catch (Exception e)
@@ -850,6 +849,14 @@ namespace OpenSim.Region.Framework.Scenes
m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString());
}
// 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
#region Interest Management

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -951,7 +951,7 @@ namespace OpenSim.Region.Framework.Scenes
/// its existing localID and UUID.
/// </summary>
/// <param name='part'>Root part for this scene object.</param>
public SceneObjectGroup(SceneObjectPart part)
public SceneObjectGroup(SceneObjectPart part) : this()
{
SetRootPart(part);
}