merge

indra/cmake/CMakeLists.txt

indra/llcommon/llassettype.h

indra/llinventory/llinventorytype.h

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llassetuploadresponders.h

indra/newview/lldrawpoolavatar.h

indra/newview/llfloatertools.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llselectmgr.cpp

indra/newview/llselectmgr.h

indra/newview/llspatialpartition.cpp

indra/newview/lltooldraganddrop.cpp

indra/newview/lltooldraganddrop.h

indra/newview/llviewermenu.cpp

indra/newview/llviewerobject.cpp

indra/newview/llviewerobject.h