diff options
| author | Melanie | 2013-06-04 21:09:25 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-04 21:09:25 +0100 |
| commit | 648e258b8e79e52df18f41f2ec79016a095f7766 (patch) | |
| tree | de96993d11a0183ac026cec61e0e5a937f801c3c /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | New HttpServer_OpenSim.dll with increased limits on number of connections, re... (diff) | |
| download | opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.zip opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.gz opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.bz2 opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6bac468..6ef83fb 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1569,6 +1569,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1569 | 1569 | ||
| 1570 | try | 1570 | try |
| 1571 | { | 1571 | { |
| 1572 | EventManager.TriggerRegionHeartbeatStart(this); | ||
| 1573 | |||
| 1572 | // Apply taints in terrain module to terrain in physics scene | 1574 | // Apply taints in terrain module to terrain in physics scene |
| 1573 | if (Frame % m_update_terrain == 0) | 1575 | if (Frame % m_update_terrain == 0) |
| 1574 | { | 1576 | { |