diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 10:23:56 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 10:23:56 -0500 |
| commit | 1204468415dd5248bbd01d7aaede520ede3b9d36 (patch) | |
| tree | b378b94ff7266ce5c7f719b3ba55c836837869e9 /indra/newview/llviewermedia.h | |
| parent | 0f2248ea12713822c546e362487aa94bb29e2899 (diff) | |
| parent | 1820095dd4a64c142e14869c76ae09e1e0ca6a12 (diff) | |
Merge DRTVWR-489 to main on promotion of Emoji viewer (#673).
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index f1f42afd81..ad7c4bcefa 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -74,7 +74,7 @@ class LLViewerMedia: public LLSingleton<LLViewerMedia> { LLSINGLETON(LLViewerMedia); ~LLViewerMedia(); - void initSingleton(); + void initSingleton() override; LOG_CLASS(LLViewerMedia); public: |