diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-04-06 16:32:25 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-04-06 16:32:25 +0100 |
| commit | bca5bb240d21e0f1bad5c3924587d62c1c7a7b7c (patch) | |
| tree | 36baeda88c70a7ca58059b316641c32139b5d3f1 /indra/newview/llappviewer.h | |
| parent | 704aeb09d81f0fa37e343460edb1ab11ba3dbc8c (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge remote-tracking branch 'origin/master' into SL-14999
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 5332fe2deb..d24cdcedc7 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -195,6 +195,8 @@ public: void purgeCache(); // Clear the local cache. void purgeCacheImmediate(); //clear local cache immediately. S32 updateTextureThreads(F32 max_time); + + void loadKeyBindings(); // mute/unmute the system's master audio virtual void setMasterSystemAudioMute(bool mute); |