summaryrefslogtreecommitdiff
path: root/indra/llcommon/llworkerthread.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-11 10:31:39 -0400
committerOz Linden <oz@lindenlab.com>2011-10-11 10:31:39 -0400
commitbaf802e25b1006783a69625e90022db087aabbfb (patch)
treeb263824abb55c00034ad46513b603b493bc2ff8b /indra/llcommon/llworkerthread.h
parentbba1141facb9b0e0ed6bb73535fca1f20ddcfa59 (diff)
parent5ef05e151d24e15a175d4f78ff17b6abdd36bbc4 (diff)
merge changes for STORM-1641
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);