merge changes for storm-1210

autobuild.xml

indra/llcommon/CMakeLists.txt

indra/llcommon/llaccountingquota.h

indra/llinventory/llparcel.cpp

indra/llinventory/llparcel.h

indra/llprimitive/llmodel.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llrender.cpp

indra/llrender/llrendertarget.cpp

indra/newview/CMakeLists.txt

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

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

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

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

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

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

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

indra/newview/featuretable_mac.txt

indra/newview/llaccountingquotamanager.cpp