Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.

.hgtags

BuildParams

build.sh

doc/contributions.txt

indra/cmake/JsonCpp.cmake

indra/cmake/Linking.cmake

indra/llimage/llimagepng.cpp

indra/llmessage/tests/testrunner.py

indra/llui/llfloater.cpp

indra/lscript/lscript_byteformat.h

indra/lscript/lscript_compile/indra.l

indra/newview/CMakeLists.txt

indra/newview/app_settings/keywords.ini

indra/newview/app_settings/settings.xml

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl

...iew/app_settings/shaders/class1/deferred/pointLightF.glsl

...ew/app_settings/shaders/class1/deferred/softenLightF.glsl

...ew/app_settings/shaders/class2/deferred/softenLightF.glsl

indra/newview/llassetuploadqueue.cpp

indra/newview/llcompilequeue.cpp