Automated merge with file:///Users/oz/Work/viewer-development

doc/contributions.txt

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llhudnametag.cpp

indra/newview/llscriptfloater.cpp

indra/newview/llscriptfloater.h

indra/newview/lltoastgroupnotifypanel.cpp

indra/newview/lltoastnotifypanel.cpp

indra/newview/lltoastscripttextbox.cpp

indra/newview/lltoastscripttextbox.h

indra/newview/llviewermenu.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewerwindow.cpp

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

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

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

...ewview/skins/default/xui/en/panel_preferences_general.xml

.../newview/skins/default/xui/en/panel_preferences_sound.xml

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

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