Automated merge with file:///e:\code\viewer-experience

.hgtags

BuildParams

autobuild.xml

indra/llcommon/llversionviewer.h

indra/llcrashlogger/llcrashlogger.cpp

indra/llmath/llvolume.cpp

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llprimitive/llmodel.cpp

indra/llprimitive/llmodel.h

indra/llprimitive/llprimitive.h

indra/llrender/llvertexbuffer.cpp

indra/llui/lltextbase.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

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

.../app_settings/shaders/class1/deferred/softenLightMSF.glsl

...ew/app_settings/shaders/class1/interface/solidcolorF.glsl