diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-05-23 18:26:14 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-05-23 18:26:14 -0600 |
| commit | 774544bc51ce365f7fd37e7d51210f290b546cf2 (patch) | |
| tree | cf3cf3ab23ddd28402564ec3e32635e3c1e81fdc /indra/newview/llappviewer.h | |
| parent | 2cdd6c2749b6553f8081e25e426501acd4025888 (diff) | |
| parent | 16616ae48d86da75b3809fa6be6c846a9d420603 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 627652dc30..30e208d01c 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -171,7 +171,8 @@ public: void purgeCache(); // Clear the local cache. void purgeCacheImmediate(); //clear local cache immediately. - + S32 updateTextureThreads(F32 max_time); + // mute/unmute the system's master audio virtual void setMasterSystemAudioMute(bool mute); virtual bool getMasterSystemAudioMute(); |