merge from viewer-hotfix

indra/newview/llfavoritesbar.cpp

indra/newview/llimview.cpp

indra/newview/skins/default/xui/da/panel_status_bar.xml

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

indra/newview/skins/default/xui/en/panel_status_bar.xml

indra/newview/skins/default/xui/es/panel_status_bar.xml

indra/newview/skins/default/xui/fr/panel_status_bar.xml

indra/newview/skins/default/xui/it/panel_status_bar.xml

indra/newview/skins/default/xui/ja/panel_status_bar.xml

indra/newview/skins/default/xui/pl/panel_status_bar.xml

indra/newview/skins/default/xui/pt/panel_status_bar.xml

indra/win_updater/CMakeLists.txt