diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 18:28:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 18:28:07 +0200 |
| commit | 43049bcff497df650c25897d640de9f038d87254 (patch) | |
| tree | c19376fa42061e5eee4e55d55cb8cb0a48e26fda /indra/newview/llchannelmanager.h | |
| parent | 9f0faf5c892bba9703c713a29202a8ac48bfdf8b (diff) | |
| parent | faf69f407fa95d9dc19f6d737f606e18ab32d052 (diff) | |
Merge pull request #916 from secondlife/marchcat/yz-merge
emoji release -> maint yz merge
Diffstat (limited to 'indra/newview/llchannelmanager.h')
| -rw-r--r-- | indra/newview/llchannelmanager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h index 8abe350196..22ae595d66 100644 --- a/indra/newview/llchannelmanager.h +++ b/indra/newview/llchannelmanager.h @@ -46,7 +46,7 @@ class LLChannelManager : public LLSingleton<LLChannelManager> LLSINGLETON(LLChannelManager); virtual ~LLChannelManager(); - void cleanupSingleton(); + void cleanupSingleton() override; public: |