Import some changes from internal
Fix up a bunch more run-time UI warnings.
Fix recursive call to LLNotifications::initSingleton
Fix recursive calls to LLWaterParamManager::initSingleton and LLWLParamManager::initSingleton
Fix windows compile warnings.
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer into Cupcake

Conflicts:
	indra/newview/llappviewer.cpp
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into Cupcake