diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:49:35 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:49:35 +0300 |
commit | d83c6563aacb0cbc2a196d575f409cc89bd8db12 (patch) | |
tree | 574ad51cabb3920d55418bd5b10b98d87990c481 /indra/newview/llappviewer.h | |
parent | c2711f2d763cfbf96d8db48b0809dd7a6e65a73e (diff) | |
parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) |
Merge branch 'master' into DRTVWR-527-maint
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); |