Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into V2TextureSystem

Browse Source 
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
This commit is contained in:
Shyotl
2011-04-12 22:29:49 -05:00
parent 3a3805fd18 aa1167e4d5
commit 4d4c49cd24
95 changed files with 3056 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/lloverlaybar.cpp
View File

@@ -477,6 +477,23 @@ void LLOverlayBar::setCancelTPButtonVisible(BOOL b, const std::string& label)
}
////////////////////////////////////////////////////////////////////////////////
void LLOverlayBar::audioFilterPlay()
{
if (gOverlayBar && gOverlayBar->mMusicState != PLAYING)
{
gOverlayBar->mMusicState = PLAYING;
}
}
void LLOverlayBar::audioFilterStop()
{
if (gOverlayBar && gOverlayBar->mMusicState != STOPPED)
{
gOverlayBar->mMusicState = STOPPED;
}
}
////////////////////////////////////////////////////////////////////////////////
// static media helpers
// *TODO: Move this into an audio manager abstraction