Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xmlmaster
commit
e0d8c57b1d
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xmlmaster