merge from viewer-trunk

indra/llcommon/llassettype.cpp

indra/llcommon/llerror.cpp

indra/llcommon/llversionviewer.h

indra/llimage/llimage.cpp

indra/llinventory/llinventorytype.cpp

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginmessagepipe.cpp

indra/llplugin/llpluginmessagepipe.h

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/llpluginprocesschild.h

indra/llplugin/llpluginprocessparent.cpp

indra/llplugin/llpluginprocessparent.h

indra/llui/llaccordionctrltab.cpp

indra/llui/llaccordionctrltab.h

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llui/llspinctrl.cpp

indra/llui/llspinctrl.h

indra/llwindow/llwindowwin32.cpp