merge

.hgtags

indra/llcommon/llsys.cpp

indra/llcommon/llversionviewer.h

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/llui/llview.cpp

indra/llwindow/llwindowwin32.cpp

indra/newview/llfloaterimagepreview.cpp

indra/newview/llinventorymodel.h

indra/newview/llviewerwindow.cpp

indra/newview/skins/default/xui/de/floater_about.xml

indra/newview/skins/default/xui/de/floater_about_land.xml

indra/newview/skins/default/xui/de/floater_avatar.xml

indra/newview/skins/default/xui/de/floater_buy_currency.xml

indra/newview/skins/default/xui/de/floater_camera.xml

...ewview/skins/default/xui/de/floater_hardware_settings.xml

indra/newview/skins/default/xui/de/floater_model_preview.xml

indra/newview/skins/default/xui/de/floater_model_wizard.xml

indra/newview/skins/default/xui/de/floater_moveview.xml

indra/newview/skins/default/xui/de/floater_snapshot.xml