merge

...w/app_settings/shaders/class1/deferred/alphaSkinnedV.glsl

.../newview/app_settings/shaders/class2/deferred/alphaF.glsl

...w/app_settings/shaders/class2/deferred/alphaSkinnedV.glsl

.../newview/app_settings/shaders/class2/deferred/alphaV.glsl

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/llappviewerwin32.cpp

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloatermodelpreview.h

indra/newview/llmeshrepository.cpp

indra/newview/llviewercamera.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/pipeline.cpp

indra/newview/pipeline.h

indra/newview/skins/default/xui/en/floater_model_wizard.xml