diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-12 21:14:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 21:14:45 +0200 |
| commit | 6b285674bba145dd70b90a06248ba8dd7fdc474a (patch) | |
| tree | 110015e1703b331715fbf7fb1a01639c74c47e62 /indra/newview/llviewerparcelmediaautoplay.h | |
| parent | 748c0eb50d87a3f8895b25791409ce5e2e4926c4 (diff) | |
| parent | eb1ed3896fd82d4f115b2ef6ba742315ad32cc27 (diff) | |
Merge main into DRTVWR-600-maint-A
Diffstat (limited to 'indra/newview/llviewerparcelmediaautoplay.h')
| -rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h index 49d7d76411..990906fedc 100644 --- a/indra/newview/llviewerparcelmediaautoplay.h +++ b/indra/newview/llviewerparcelmediaautoplay.h @@ -35,7 +35,7 @@ class LLViewerParcelMediaAutoPlay : LLEventTimer, public LLSingleton<LLViewerPar { LLSINGLETON(LLViewerParcelMediaAutoPlay); public: - virtual bool tick(); + virtual bool tick() override; static void playStarted(); private: |