summaryrefslogtreecommitdiff
path: root/indra/llcommon/llworkerthread.h
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-10-12 14:40:49 -0400
committerLogan Dethrow <log@lindenlab.com>2011-10-12 14:40:49 -0400
commitad3ffeed867145693500daf903c581b91b1dfcb5 (patch)
tree43815c43b04b3afe29b54993193b2863949984c3 /indra/llcommon/llworkerthread.h
parent6fae13579eccf64959451a3aab1b77fa2ac02155 (diff)
parentaabdbeadf53b3a20b4db563a23535af74fd7d4b7 (diff)
Merge
Diffstat (limited to 'indra/llcommon/llworkerthread.h')
-rw-r--r--indra/llcommon/llworkerthread.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h
index bef5ef53fe..973b78ca01 100644
--- a/indra/llcommon/llworkerthread.h
+++ b/indra/llcommon/llworkerthread.h
@@ -83,7 +83,7 @@ private:
LLMutex* mDeleteMutex;
public:
- LLWorkerThread(const std::string& name, bool threaded = true);
+ LLWorkerThread(const std::string& name, bool threaded = true, bool should_pause = false);
~LLWorkerThread();
/*virtual*/ S32 update(U32 max_time_ms);