aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorTalun2015-05-19 19:07:48 +0100
committerMichael Cerquoni2015-05-20 14:36:54 -0400
commitd9afe354ac90c9a9b75f2ff05f3b8180225334fb (patch)
tree5de489eadc3312abb5b69ed09eb5903077454e6a /OpenSim/Region/Framework
parentresolve possible nullref when sending appearance packet. Thanks to zadark for... (diff)
downloadopensim-SC-d9afe354ac90c9a9b75f2ff05f3b8180225334fb.zip
opensim-SC-d9afe354ac90c9a9b75f2ff05f3b8180225334fb.tar.gz
opensim-SC-d9afe354ac90c9a9b75f2ff05f3b8180225334fb.tar.bz2
opensim-SC-d9afe354ac90c9a9b75f2ff05f3b8180225334fb.tar.xz
New values returned by llGetEnv
Implements recent changes to llGetEnv region_cpu_ratio hardcoded to 1 region_product_sku hardcoded to OpenSim Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
Diffstat (limited to 'OpenSim/Region/Framework')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 906c862..643dca3 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -454,6 +454,12 @@ namespace OpenSim.Region.Framework.Scenes
454 454
455 private string m_defaultScriptEngine; 455 private string m_defaultScriptEngine;
456 456
457 private int m_unixStartTime;
458 public int UnixStartTime
459 {
460 get { return m_unixStartTime; }
461 }
462
457 /// <summary> 463 /// <summary>
458 /// Tick at which the last login occurred. 464 /// Tick at which the last login occurred.
459 /// </summary> 465 /// </summary>
@@ -1438,7 +1444,7 @@ namespace OpenSim.Region.Framework.Scenes
1438 1444
1439 m_isRunning = true; 1445 m_isRunning = true;
1440 m_active = true; 1446 m_active = true;
1441 1447 m_unixStartTime = Util.UnixTimeSinceEpoch();
1442// m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName); 1448// m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName);
1443 if (m_heartbeatThread != null) 1449 if (m_heartbeatThread != null)
1444 { 1450 {