merge fix for STORM-189

.hgtags

BuildParams

doc/contributions.txt

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llimview.cpp

indra/newview/llpanelmaininventory.cpp

indra/newview/llpanelmaininventory.h

indra/newview/llviewermenu.cpp

...view/skins/default/xui/en/menu_inventory_gear_default.xml

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

...a/newview/skins/default/xui/en/panel_preferences_move.xml

...newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml

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

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