diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-09-30 15:54:20 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-09-30 15:54:20 +0200 |
| commit | ed2d4f02d93459bf114ebeab8727d507b7bfc0ef (patch) | |
| tree | a216907e2c01db7932c83e212319cb7a8c790013 /indra/newview/lllocalgltfmaterials.cpp | |
| parent | a8d8314cb9af193ea7ce95456fb308217ba28e3c (diff) | |
| parent | a409503653bebacbc498409806f9e1a4b97ed6ac (diff) | |
Merge branch 'develop' into rlva/base
Diffstat (limited to 'indra/newview/lllocalgltfmaterials.cpp')
| -rw-r--r-- | indra/newview/lllocalgltfmaterials.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp index fab18f2d26..3af1433a40 100644 --- a/indra/newview/lllocalgltfmaterials.cpp +++ b/indra/newview/lllocalgltfmaterials.cpp @@ -294,17 +294,12 @@ LLLocalGLTFMaterialTimer::~LLLocalGLTFMaterialTimer() void LLLocalGLTFMaterialTimer::startTimer() { - mEventTimer.start(); + start(); } void LLLocalGLTFMaterialTimer::stopTimer() { - mEventTimer.stop(); -} - -bool LLLocalGLTFMaterialTimer::isRunning() -{ - return mEventTimer.getStarted(); + stop(); } bool LLLocalGLTFMaterialTimer::tick() |