Merge, fixed conflict in panel_preferences_sound.xml

indra/llmessage/llregionflags.h

indra/llui/lldockablefloater.h

indra/llui/lldockcontrol.h

indra/llui/llflatlistview.cpp

indra/llui/llhelp.h

indra/llui/lltexteditor.cpp

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/llui/llurlregistry.cpp

indra/lscript/lscript_export.h

indra/lscript/lscript_library.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_lad.xml

indra/newview/llappviewer.cpp

indra/newview/llavataractions.cpp

indra/newview/llavataractions.h

indra/newview/llchiclet.cpp

indra/newview/llchiclet.h

indra/newview/llcolorswatch.cpp