merge

.hgtags

indra/newview/llchathistory.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llexternaleditor.cpp

indra/newview/llexternaleditor.h

indra/newview/llfloatertopobjects.cpp

indra/newview/llfloateruipreview.cpp

indra/newview/llnearbychathandler.cpp

indra/newview/llpreviewscript.cpp

indra/newview/llviewerchat.cpp

indra/newview/llviewerchat.h

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

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

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

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

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

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

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

indra/newview/skins/minimal/xui/de/floater_media_browser.xml

indra/newview/skins/minimal/xui/de/floater_web_content.xml