diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-27 14:08:04 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-27 14:08:04 -0800 |
| commit | dbb2dadb68f5ed4349626bb91dcfcce76d901124 (patch) | |
| tree | a6281467b5038fdfa878772894f9fdecb26188bd /indra/newview/llappviewer.cpp | |
| parent | 4421a51cfeb43b3be6de520acb9f94052fc7e2df (diff) | |
| parent | d3f361752e5988800228cff11fcc50289b2f88c7 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 0e248ff88b..9aa15789ed 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2685,7 +2685,7 @@ void LLAppViewer::handleViewerCrash() gMessageSystem->stopLogging(); } - LLWorld::getInstance()->getInfo(gDebugInfo); + if (LLWorld::instanceExists()) LLWorld::getInstance()->getInfo(gDebugInfo); // Close the debug file pApp->writeDebugInfo(); @@ -4405,3 +4405,15 @@ void LLAppViewer::launchUpdater() // LLAppViewer::instance()->forceQuit(); } + +//virtual +void LLAppViewer::setMasterSystemAudioMute(bool mute) +{ + gSavedSettings.setBOOL("MuteAudio", mute); +} + +//virtual +bool LLAppViewer::getMasterSystemAudioMute() +{ + return gSavedSettings.getBOOL("MuteAudio"); +} |