diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 11:15:53 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 11:15:53 -0500 |
commit | b242d696ba03f66494dfca1f05a74ed1b15cd6e4 (patch) | |
tree | 9c432e679ce270642bbca587f3c9c9a36b348bc1 /indra/newview/llversioninfo.h | |
parent | 19b808316b7d4095905baf6ff9f26e3045a86fcd (diff) | |
parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) |
Merge branch 'main' of github.com:secondlife/viewer
on promotion of DRTVWR-489 Emoji viewer.
Diffstat (limited to 'indra/newview/llversioninfo.h')
-rw-r--r-- | indra/newview/llversioninfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h index a40042380a..f82c5ffa98 100644 --- a/indra/newview/llversioninfo.h +++ b/indra/newview/llversioninfo.h @@ -47,7 +47,7 @@ class LLStoreListener; class LLVersionInfo: public LLSingleton<LLVersionInfo> { LLSINGLETON(LLVersionInfo); - void initSingleton(); + void initSingleton() override; public: ~LLVersionInfo(); |