diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-13 10:50:25 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-13 10:50:25 +0200 |
commit | f83ada32f728740254668792f9d77b5745d80d2e (patch) | |
tree | 593a31ab109e1e8b088d0c2a5536e73cb6b9a050 /indra/newview/llviewerparcelmediaautoplay.h | |
parent | b1ac8092eecf5fc9dc4b4867370a51e5dfba4331 (diff) | |
parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerparcelmediaautoplay.h')
-rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h index a052362829..33565307f2 100644 --- a/indra/newview/llviewerparcelmediaautoplay.h +++ b/indra/newview/llviewerparcelmediaautoplay.h @@ -31,13 +31,11 @@ #include "lluuid.h" // timer to automatically play media -class LLViewerParcelMediaAutoPlay : LLEventTimer +class LLViewerParcelMediaAutoPlay : LLEventTimer, public LLSingleton<LLViewerParcelMediaAutoPlay> { - public: - LLViewerParcelMediaAutoPlay(); + LLSINGLETON(LLViewerParcelMediaAutoPlay); +public: virtual BOOL tick(); - static void initClass(); - static void cleanupClass(); static void playStarted(); private: |