summaryrefslogtreecommitdiff
path: root/indra/newview/llmutelist.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-03-01 10:23:56 -0500
committerNat Goodspeed <nat@lindenlab.com>2024-03-01 10:23:56 -0500
commit1204468415dd5248bbd01d7aaede520ede3b9d36 (patch)
treeb378b94ff7266ce5c7f719b3ba55c836837869e9 /indra/newview/llmutelist.h
parent0f2248ea12713822c546e362487aa94bb29e2899 (diff)
parent1820095dd4a64c142e14869c76ae09e1e0ca6a12 (diff)
Merge DRTVWR-489 to main on promotion of Emoji viewer (#673).
Diffstat (limited to 'indra/newview/llmutelist.h')
-rw-r--r--indra/newview/llmutelist.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index 14840f1b2e..dda407e708 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -73,7 +73,7 @@ class LLMuteList : public LLSingleton<LLMuteList>
{
LLSINGLETON(LLMuteList);
~LLMuteList();
- /*virtual*/ void cleanupSingleton();
+ /*virtual*/ void cleanupSingleton() override;
public:
// reasons for auto-unmuting a resident
enum EAutoReason