diff options
| author | Kyler "Félix" Eastridge <felix.wolfz@gmail.com> | 2026-09-13 12:08:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-13 19:08:23 +0300 |
| commit | 893c748376c4ad0621eb682caaab805d7e5cd625 (patch) | |
| tree | 433cee0ea7b6d4cf1049a186951d2e4f4ba43d9d | |
| parent | 8fb3801667bf5f8fadfe191d8628b2b3cf443273 (diff) | |
#6311 Fix LLWorld SpaceTime updating
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llworld.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 386ffe9601..01ba5bdaa7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -5311,7 +5311,7 @@ void LLAppViewer::idle() { LL_PROFILE_ZONE_NAMED_CATEGORY_NETWORK("network"); //LL_RECORD_BLOCK_TIME(FTM_NETWORK); // Update spaceserver timeinfo - LLWorld::getInstance()->setSpaceTimeUSec(LLWorld::getInstance()->getSpaceTimeUSec() + LLUnits::Seconds::fromValue(dt_raw)); + LLWorld::getInstance()->setSpaceTimeUSec(LLWorld::getInstance()->getSpaceTimeUSec() + (U64)(dt_raw * USEC_PER_SEC)); ////////////////////////////////////// diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index dc95a4eff1..751945c0c9 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -199,6 +199,9 @@ private: S32 mLastPacketsOut; S32 mLastPacketsLost; U32 mNumOfActiveCachedObjects; + + // Authoritative time source from the simulator + // Not currently used by viewer but might be in use by 3p branches U64MicrosecondsImplicit mSpaceTimeUSec; //////////////////////////// |