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

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/llaudio/llaudioengine.cpp
This commit is contained in:
Latif Khalifa
2013-10-12 10:04:05 +02:00
parent e8c286308d 7fb05e6a48
commit cb12a35102
18 changed files with 526 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerwindow.cpp
View File

@@ -1432,7 +1432,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
}
// Unmute audio
audio_update_volume();
audio_update_volume(false);
}
else
{
@@ -1457,7 +1457,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
stopGL();
}
// Mute audio
audio_update_volume();
audio_update_volume(false);
}
return TRUE;
}