summaryrefslogtreecommitdiff
path: root/indra/newview/lllocalbitmaps.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2024-06-10 16:05:57 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2024-06-10 16:05:57 +0300
commit7331d281e84da73907e1067b03ad4662991f4808 (patch)
treef911416d189a02775a21e3fc94b4bf8027e4ada9 /indra/newview/lllocalbitmaps.cpp
parente99c494418b4eec21ce3c17c5e642c253fae8084 (diff)
parentdbc785d4433080ca49b9cd899c756c9700a1a794 (diff)
Merge branch 'release/luau-scripting' into lua-ui-callbacks
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
-rw-r--r--indra/newview/lllocalbitmaps.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 5b7243ece2..a2a6210572 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -996,23 +996,18 @@ LLLocalBitmapTimer::~LLLocalBitmapTimer()
void LLLocalBitmapTimer::startTimer()
{
- mEventTimer.start();
+ start();
}
void LLLocalBitmapTimer::stopTimer()
{
- mEventTimer.stop();
+ stop();
}
-bool LLLocalBitmapTimer::isRunning()
-{
- return mEventTimer.getStarted();
-}
-
-BOOL LLLocalBitmapTimer::tick()
+bool LLLocalBitmapTimer::tick()
{
LLLocalBitmapMgr::getInstance()->doUpdates();
- return FALSE;
+ return false;
}
/*=======================================*/