Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer

This commit is contained in:
Siana Gearz
2013-02-17 15:40:27 +01:00
229 changed files with 15368 additions and 590 deletions

View File

@@ -1258,7 +1258,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
else
{
mActive = FALSE;
if (gAllowIdleAFK)
if (gSavedSettings.getBOOL("AllowIdleAFK"))
{
gAgent.setAFK();
}