diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 02:37:15 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 02:37:15 +0200 |
commit | 5f731d84cb5823bdc4cae5be288f2de2ffb9f5f9 (patch) | |
tree | 04ddffec7d5a004150aefd5fdbf247863e2a8926 /indra/newview/llviewerparcelmediaautoplay.h | |
parent | 4aa9dfec746f28696a195fe81aed9b6ef0791954 (diff) | |
parent | e96d0d5e304324e6ab0c469773fb7110a65fc3f1 (diff) |
Downstream merge from 494-maint-wassail
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 a404f60da1..cf8e9a97e7 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: |