diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-05-21 20:31:53 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-05-21 20:31:53 +0300 |
| commit | 2922c593160f81d19f39d80fc84a25c2a0e0d8aa (patch) | |
| tree | 7b5c5aa2889cb2e7d746d54a6ec9778cc7c77480 /indra/newview/llwatchdog.h | |
| parent | 646cde231d72fb217c6d34cd95d941a24544ca3a (diff) | |
| parent | 24501dfa0ee3fd6f5755deb1bc5261cd297a2bc7 (diff) | |
Merge branch 'sl-10297' into DRTVWR-516-maint
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 |