merge changes for drtvwr-135

build.sh

doc/contributions.txt

indra/llimage/llimagepng.cpp

indra/newview/CMakeLists.txt

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

indra/newview/lllocalbitmaps.cpp

indra/newview/lllocalbitmaps.h

indra/newview/lltexturectrl.cpp

indra/newview/lltexturectrl.h

indra/newview/lltoastnotifypanel.cpp

indra/newview/llviewercontrol.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewertexturelist.h

indra/newview/llvoavatar.cpp