diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 94ec0119ad..9c65b1262e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected float m_recoilScaleFactor = 0.0f;
         protected bool m_AllowGodFunctions;
 
-        protected double m_timer = Util.GetTimeStampMS();
+        protected double m_timer = Util.GetTimeStamp();
         protected bool m_waitingForScriptAnswer = false;
         protected bool m_automaticLinkPermission = false;
         protected int m_notecardLineReadCharsMax = 255;
@@ -2821,21 +2821,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Float llGetTime()
         {
-            double ScriptTime = Util.GetTimeStampMS() - m_timer;
-            return (float)Math.Round((ScriptTime / 1000.0), 3);
+            double ScriptTime = Util.GetTimeStamp() - m_timer;
+            return Math.Round(ScriptTime, 3);
         }
 
         public void llResetTime()
         {
-            m_timer = Util.GetTimeStampMS();
+            m_timer = Util.GetTimeStamp();
         }
 
         public LSL_Float llGetAndResetTime()
         {
-            double now = Util.GetTimeStampMS();
+            double now = Util.GetTimeStamp();
             double ScriptTime = now - m_timer;
             m_timer = now;
-            return (float)Math.Round((ScriptTime / 1000.0), 3);
+            return Math.Round(ScriptTime, 3);
         }
 
         public void llSound(string sound, double volume, int queue, int loop)
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
index 992783f2fd..99335a2285 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
@@ -78,14 +78,14 @@ namespace OpenSim.Region.ScriptEngine.Yengine
             inst.Die();
         }
 
-        public void SetLSLTimer(double time)
+        public void SetLSLTimerMS(double timeMS)
         {
-            m_timer = time;
+            m_timer = 0.001 * timeMS;
         }
 
-        public double getLSLTimer()
+        public double getLSLTimerMS()
         {
-            return(m_timer);
+            return m_timer * 1000.0;
         }
 
         /**
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs
index d2c86ecac3..67cae3d6dc 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
 
                 if(m_XMRLSLApi is not null)
                 {
-                    double scriptTime = Util.GetTimeStampMS() - m_XMRLSLApi.getLSLTimer();
+                    double scriptTime = Util.GetTimeStampMS() - m_XMRLSLApi.getLSLTimerMS();
                     XmlElement scriptTimeN = doc.CreateElement("", "scrpTime", "");
                     scriptTimeN.AppendChild(doc.CreateTextNode(scriptTime.ToString()));
                     scriptStateN.AppendChild(scriptTimeN);
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs
index 0b749a36ee..3f311903c6 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs
@@ -514,7 +514,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                 XmlElement scpttimeN = (XmlElement)scriptStateN.SelectSingleNode("scrpTime");
                 if (scpttimeN != null && Double.TryParse(scpttimeN.InnerText, out double t))
                 {
-                    m_XMRLSLApi.SetLSLTimer(Util.GetTimeStampMS() - t);
+                    m_XMRLSLApi.SetLSLTimerMS(Util.GetTimeStampMS() - t);
                 }
             }