merge

BuildParams

indra/llui/llmenugl.cpp

indra/llui/llnotifications.cpp

indra/llui/llview.cpp

indra/llui/llview.h

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llfilepicker.cpp

indra/newview/llfilepicker.h

indra/newview/llpopupview.cpp

indra/newview/llpopupview.h

indra/newview/llviewerwindow.cpp

indra/newview/llvoiceclient.cpp

indra/newview/llvoiceclient.h

indra/newview/llvoicevivox.cpp

indra/newview/llvoicevivox.h

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

indra/newview/skins/minimal/xui/en/main_view.xml