Automated merge with ssh://bitbucket.org/lindenlab/viewer64

indra/cmake/LLAddBuildTest.cmake

indra/llcommon/lleventdispatcher.h

indra/llcommon/llinstancetracker.h

indra/llcommon/llpreprocessor.h

indra/llcommon/lltrace.h

indra/llcommon/tests/llsdserialize_test.cpp

indra/llimage/llimagetga.cpp

indra/llmath/v4color.cpp

indra/llmath/v4color.h

indra/llmath/v4coloru.h

indra/llwindow/llopenglview-objc.mm

indra/llwindow/llwindowmacosx.cpp

indra/newview/llappdelegate-objc.mm

indra/newview/llappviewermacosx.cpp

indra/newview/llpanelexperiencelisteditor.cpp

indra/newview/llpresetsmanager.cpp

indra/newview/llviewerstats.cpp