merge from PE's viewer-release

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/newview/app_settings/settings_per_account.xml

indra/newview/llfloatercamera.cpp

indra/newview/llfloatercamera.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/lljoystickbutton.cpp

indra/newview/lljoystickbutton.h

indra/newview/llstartup.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewerwindow.cpp

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

...ewview/skins/default/xui/en/panel_preferences_general.xml

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