aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-03-23 14:24:55 +0000
committerMelanie2012-03-23 14:24:55 +0000
commit9a67baae2162faf0f2c3d77390c855a5659a167e (patch)
tree63e7ad9d3ce24731c1757a8c7197b1e16a873e52 /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentfix yield prolog so it compiles with mono 2.11 there has been a bugzilla (diff)
downloadopensim-SC_OLD-9a67baae2162faf0f2c3d77390c855a5659a167e.zip
opensim-SC_OLD-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.gz
opensim-SC_OLD-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.bz2
opensim-SC_OLD-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs16
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6e70c36..6ac7846 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -104,6 +104,11 @@ namespace OpenSim.Region.Framework.Scenes
104 public bool m_allowScriptCrossings; 104 public bool m_allowScriptCrossings;
105 public bool m_useFlySlow; 105 public bool m_useFlySlow;
106 106
107 /// <summary>
108 /// Temporarily setting to trigger appearance resends at 60 second intervals.
109 /// </summary>
110 public bool SendPeriodicAppearanceUpdates { get; set; }
111
107 protected float m_defaultDrawDistance = 255.0f; 112 protected float m_defaultDrawDistance = 255.0f;
108 public float DefaultDrawDistance 113 public float DefaultDrawDistance
109 { 114 {
@@ -790,6 +795,7 @@ namespace OpenSim.Region.Framework.Scenes
790 m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences); 795 m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences);
791 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); 796 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain);
792 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); 797 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning);
798 SendPeriodicAppearanceUpdates = startupConfig.GetBoolean("SendPeriodicAppearanceUpdates", SendPeriodicAppearanceUpdates);
793 } 799 }
794 } 800 }
795 catch (Exception e) 801 catch (Exception e)
@@ -1345,6 +1351,16 @@ namespace OpenSim.Region.Framework.Scenes
1345 }); 1351 });
1346 } 1352 }
1347 1353
1354 if (SendPeriodicAppearanceUpdates && MaintenanceRun % 60 == 0)
1355 {
1356// m_log.DebugFormat("[SCENE]: Sending periodic appearance updates");
1357
1358 if (AvatarFactory != null)
1359 {
1360 ForEachRootScenePresence(sp => AvatarFactory.SendAppearance(sp.UUID));
1361 }
1362 }
1363
1348 Watchdog.UpdateThread(); 1364 Watchdog.UpdateThread();
1349 1365
1350 previousMaintenanceTick = m_lastMaintenanceTick; 1366 previousMaintenanceTick = m_lastMaintenanceTick;