diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:17:37 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:17:37 -0800 |
| commit | 8164dce567d1bd59a1de3f488b01783a5ab69ed4 (patch) | |
| tree | 5e509afd404c086e32ee4ba91b48118c0e3068f5 /indra/newview/llviewerparcelmediaautoplay.h | |
| parent | 7d1e3e08fcfbb3801edde3b6d248080055cd0a75 (diff) | |
| parent | 258c039584dd293ba7218dc522882bc0bac25e63 (diff) | |
Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette
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 d71fd4c075..e83085dee0 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: |