Merge https://github.com/Lirusaito/SingularityViewer/tree/Release

# Conflicts: # indra/newview/app_settings/settings_sh.xml
2017-03-27 23:25:33 -05:00
parent 97a6f3a7b2 0dfef2ab25
commit f95be54bd5
71 changed files with 9187 additions and 79 deletions
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -366,6 +366,7 @@ LLPostProcess::LLPostProcess(void) :
 		parser->parse(effectsXML, mAllEffectInfo, LLSDSerialize::SIZE_UNLIMITED);
 	}

+	// Singu TODO: Make this configurable via settings
 	if (!mAllEffectInfo.has("default"))
 		mAllEffectInfo["default"] = LLSD::emptyMap();