merge from viewer-trunk

indra/llcommon/llapp.h

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llcommon/llstring.cpp

indra/llcommon/llstring.h

indra/llcommon/lluri.cpp

indra/llcommon/lluuid.cpp

indra/llcommon/lluuid.h

indra/llcommon/llversionserver.h

indra/llcommon/llversionviewer.h

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llinventory/CMakeLists.txt

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/llinventory/llinventorydefines.cpp

indra/llinventory/llinventorydefines.h

indra/llinventory/llinventorytype.h

indra/llinventory/llparcel.cpp

indra/llinventory/llparcel.h