summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-04-01 21:14:16 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-04-01 21:14:16 +0000
commit2130b6b144b64c223a656206f0d3e9babfd9a863 (patch)
tree8f47ce24e0d455c0478e6266d8a7c3874883e055 /indra/newview/llappviewer.h
parentd357bf7ae5c5e0b6e66e7d82ce1677360b4cb990 (diff)
parent3cad30d9ee6a0cd2a68ed213e7383fa11df9d9f5 (diff)
Merged in DV525-merge-6.4.18 (pull request #511)
DRTVWR-525 merge up to 6.4.18
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r--indra/newview/llappviewer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 11432346b1..5ceb540784 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);