Merge from viewer-development

indra/llcommon/llversionviewer.h

indra/llui/llcombobox.cpp

indra/llui/llfloater.cpp

indra/newview/app_settings/settings.xml

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfavoritesbar.h

indra/newview/llfloaterpostcard.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llnearbychathandler.cpp

indra/newview/llpanelplaces.cpp

indra/newview/llpanelplaces.h

indra/newview/llscreenchannel.cpp

indra/newview/llscreenchannel.h

indra/newview/lltoast.cpp

indra/newview/lltoast.h

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

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

...iew/skins/default/xui/da/floater_region_debug_console.xml