Merge remote-tracking branch 'lirusaito/master'

This commit is contained in:
Latif Khalifa
2013-06-03 01:36:35 +02:00
103 changed files with 2274 additions and 2192 deletions

View File

@@ -1074,7 +1074,8 @@ void LLFloater::setForeground(BOOL front)
releaseFocus();
}
setBackgroundOpaque( front );
if (front || !LLUI::sConfigGroup->getBOOL("FloaterUnfocusedBackgroundOpaque")) // Singu Note: This can be removed when InactiveFloaterTransparency is added
setBackgroundOpaque( front );
}
}