Merge pull request #1555 from secondlife/lua-timers

Add timer support to the Lua viewer

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llfloaterlinkreplace.cpp b/indra/newview/llfloaterlinkreplace.cpp
index bd1d8ddae8..956ab0d7bc 100644
--- a/indra/newview/llfloaterlinkreplace.cpp
+++ b/indra/newview/llfloaterlinkreplace.cpp
@@ -45,7 +45,7 @@ LLFloaterLinkReplace::LLFloaterLinkReplace(const LLSD& key)
     mTargetUUID(LLUUID::null),
     mBatchSize(gSavedSettings.getU32("LinkReplaceBatchSize"))
 {
-    mEventTimer.stop();
+    stop();
 }
 
 LLFloaterLinkReplace::~LLFloaterLinkReplace()
@@ -202,7 +202,7 @@ void LLFloaterLinkReplace::onStartClickedResponse(const LLSD& notification, cons
                 mStartBtn->setEnabled(FALSE);
                 mRefreshBtn->setEnabled(FALSE);
 
-                mEventTimer.start();
+                start();
                 tick();
             }
             else
@@ -298,7 +298,7 @@ void LLFloaterLinkReplace::decreaseOpenItemCount()
         mStatusText->setText(getString("ReplaceFinished"));
         mStartBtn->setEnabled(TRUE);
         mRefreshBtn->setEnabled(TRUE);
-        mEventTimer.stop();
+        stop();
         LL_INFOS() << "Inventory link replace finished." << LL_ENDL;
     }
     else
@@ -310,7 +310,7 @@ void LLFloaterLinkReplace::decreaseOpenItemCount()
     }
 }
 
-BOOL LLFloaterLinkReplace::tick()
+bool LLFloaterLinkReplace::tick()
 {
     LL_DEBUGS() << "Calling tick - remaining items = " << mRemainingInventoryItems.size() << LL_ENDL;
 
@@ -320,7 +320,7 @@ BOOL LLFloaterLinkReplace::tick()
     {
         if (!mRemainingInventoryItems.size())
         {
-            mEventTimer.stop();
+            stop();
             break;
         }