diff options
author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2024-03-06 17:59:30 -0800 |
---|---|---|
committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2024-03-06 17:59:30 -0800 |
commit | 2b3b03566c697ec68c2cbe125e97634d2715ad3e (patch) | |
tree | 6bb4232b1927ccf38a900bcc6484348f59485d35 /indra/newview/llchannelmanager.h | |
parent | 1fc45a50ff15e6f31a4554da83256b7f59b1af15 (diff) | |
parent | 4195e355933fdba9c34040688e837e856763b81a (diff) |
Merge branch 'release/materials_featurette' into geenz/mirrors-quality-pass-1
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: |