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

Merge branch 'master' into moses

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie Thielker
2015-05-20 23:40:52 +02:00
parent 946a6622fe d9afe354ac
commit edcba95ab5
3 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,6 +457,12 @@ namespace OpenSim.Region.Framework.Scenes
private string m_defaultScriptEngine;
private int m_unixStartTime;
public int UnixStartTime
{
get { return m_unixStartTime; }
}
/// <summary>
/// Tick at which the last login occurred.
/// </summary>
@@ -1461,7 +1467,8 @@ namespace OpenSim.Region.Framework.Scenes
m_isRunning = true;
m_active = true;
// m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName);
m_unixStartTime = Util.UnixTimeSinceEpoch();
// m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName);
if (m_heartbeatThread != null)
{
m_heartbeatThread.Abort();