Conflicts:
indra/newview/skins/default/xui/en-us/floater_post_process.xml - Used Mine, because Shyotl's is the ancient one from "the before time" and because my last commit (worked on motionblur tab, then, too.)
Tweaked LLRenderTarget to support depth textures if FBO support is lacking.
Prefer LLRenderTarget::getFBO() over LLRenderTarget::sUseFBO when determining how to handle a specific LLRenderTarget object. (Decoupling to simplify logic without having to track a global)
Fixed avatar shadows on AMD (and any other sane GLSL compiler)
Fixed windows compile:
-curl version was updated after running develop.py. Not sure if applicable to linux/darwin
-new llqtwebkit version on windows, since the old url is now invalid.