merge fix for STORM-367

.hgtags

indra/newview/app_settings/high_graphics.xml

indra/newview/app_settings/low_graphics.xml

indra/newview/app_settings/mid_graphics.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/ultra_graphics.xml

indra/newview/llfloaterhardwaresettings.cpp

indra/newview/llfloaterhardwaresettings.h

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

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

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

...a/newview/skins/default/xui/de/menu_add_wearable_gear.xml

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

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

...newview/skins/default/xui/de/menu_inspect_object_gear.xml

...a/newview/skins/default/xui/de/menu_inspect_self_gear.xml

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

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

...ew/skins/default/xui/de/menu_people_friends_view_sort.xml

...w/skins/default/xui/de/menu_people_nearby_multiselect.xml