merge

indra/newview/app_settings/settings.xml

indra/newview/llfloaterpreference.cpp

indra/newview/llfriendcard.cpp

indra/newview/llfriendcard.h

indra/newview/llpanelclassified.cpp

indra/newview/llpanelnearbymedia.cpp

indra/newview/llstatusbar.cpp

indra/newview/lltexlayer.cpp

indra/newview/llviewermedia.cpp

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

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

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

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

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

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

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

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

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

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

...wview/skins/default/xui/en/panel_preferences_advanced.xml