Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0

.hgignore

indra/cmake/00-Common.cmake

indra/cmake/LLPrimitive.cmake

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llcommon/llfoldertype.cpp

indra/llcommon/llfoldertype.h

indra/llcommon/llthread.cpp

indra/llcommon/stdenums.h

indra/llinventory/llinventorytype.cpp

indra/llinventory/llinventorytype.h

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llmath/llvolumemgr.cpp

indra/llmath/m4math.cpp

indra/llmath/m4math.h

indra/llmath/v2math.cpp

indra/llmath/v2math.h

indra/llmessage/llassetstorage.cpp

indra/llmessage/lltransfermanager.cpp