diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-08 10:58:24 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-08 10:58:24 -0500 |
| commit | ee8bc528bbf97ee8cc488651fb263b07b5c1c818 (patch) | |
| tree | 292aa9a4b26749cc877f6ea8e500ec24793a20da /indra/newview/llviewerparcelmediaautoplay.h | |
| parent | de71c6378e60c0f0ea0c5537729f052da8513b19 (diff) | |
| parent | afc943acbc2bb79e2e1aa5d5eaf448e01b6c2b00 (diff) | |
Merge branch 'main' into release/luau-scripting for Emoji release.
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: |