summaryrefslogtreecommitdiff
path: root/indra/llcommon/llrun.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2023-02-08 14:52:16 +0100
committerKitty Barnett <develop@catznip.com>2023-02-08 14:52:16 +0100
commit5805bbd8104e66fb9ae7ed3c22e374e377b2f2e1 (patch)
treeaeea23255f4717f57012d5d42075659ecff6c76a /indra/llcommon/llrun.cpp
parentda0335c864477036ba996fbab4db2194535466d7 (diff)
parentb2f890408e2dc63a0f842273c41c0efed770cb9a (diff)
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer into DRTVWR-489-emoji
Diffstat (limited to 'indra/llcommon/llrun.cpp')
-rw-r--r--indra/llcommon/llrun.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llrun.cpp b/indra/llcommon/llrun.cpp
index f5d3f302fa..a3b3fccf4b 100644
--- a/indra/llcommon/llrun.cpp
+++ b/indra/llcommon/llrun.cpp
@@ -47,7 +47,7 @@ LLRunner::~LLRunner()
mRunEvery.clear();
}
-S32 LLRunner::run()
+size_t LLRunner::run()
{
// We collect all of the runnables which should be run. Since the
// runnables are allowed to adjust the run list, we need to copy