diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
| commit | ce7682c2a468e926d6b38e4f95bd289a8d26222c (patch) | |
| tree | 80535a3916676294d640b4ce47c1895d0a27cd1b /indra/newview/lloverlaybar.cpp | |
| parent | e1ab7d8a30cc40cbd1d471c67def21508c82ff49 (diff) | |
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
Diffstat (limited to 'indra/newview/lloverlaybar.cpp')
| -rw-r--r-- | indra/newview/lloverlaybar.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp index 27de489446..8e36297c93 100644 --- a/indra/newview/lloverlaybar.cpp +++ b/indra/newview/lloverlaybar.cpp @@ -101,7 +101,11 @@ LLOverlayBar::LLOverlayBar(const std::string& name, const LLRect& rect) if ( gAudiop ) { - mMusicRemote->setVolume ( gSavedSettings.getF32 ( "AudioLevelMusic" ) ); + //HACK / NOT HACK + //maintenance patch - bhear obsoletes this, do not merge (poppy) + F32 audioLevelMusic = gSavedSettings.getF32 ( "AudioLevelMusic" ); + mMusicRemote->setVolume ( audioLevelMusic ); + gAudiop->setInternetStreamGain ( audioLevelMusic ); mMusicRemote->setTransportState ( LLMediaRemoteCtrl::Stop, FALSE ); }; |