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/llappearance | |
parent | 0f2248ea12713822c546e362487aa94bb29e2899 (diff) | |
parent | 1820095dd4a64c142e14869c76ae09e1e0ca6a12 (diff) |
Merge DRTVWR-489 to main on promotion of Emoji viewer (#673).
Diffstat (limited to 'indra/llappearance')
-rw-r--r-- | indra/llappearance/llwearabletype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h index 793a33cc87..1fbe19ddd1 100644 --- a/indra/llappearance/llwearabletype.h +++ b/indra/llappearance/llwearabletype.h @@ -37,7 +37,7 @@ class LLWearableType : public LLParamSingleton<LLWearableType> { LLSINGLETON(LLWearableType, LLTranslationBridge::ptr_t &trans); ~LLWearableType(); - void initSingleton(); + void initSingleton() override; public: enum EType { |