diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:55:57 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:55:57 -0600 |
| commit | 4c849ba91363f82da05cce1221b04075a6ca72af (patch) | |
| tree | 33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/newview/llwatchdog.h | |
| parent | dc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' v 6.4.22 into DRTVWR-528
Diffstat (limited to 'indra/newview/llwatchdog.h')
| -rw-r--r-- | indra/newview/llwatchdog.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llwatchdog.h b/indra/newview/llwatchdog.h index 9a6624258e..ce5cf748f4 100644 --- a/indra/newview/llwatchdog.h +++ b/indra/newview/llwatchdog.h @@ -83,9 +83,7 @@ public: void add(LLWatchdogEntry* e); void remove(LLWatchdogEntry* e); - typedef boost::function<void (void)> killer_event_callback; - - void init(killer_event_callback func = NULL); + void init(); void run(); void cleanup(); @@ -98,8 +96,6 @@ private: LLMutex* mSuspectsAccessMutex; LLWatchdogTimerThread* mTimer; U64 mLastClockCount; - - killer_event_callback mKillerCallback; }; #endif // LL_LLTHREADWATCHDOG_H |