Merge with remote repo

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginclassmediaowner.h

indra/llui/lllineeditor.cpp

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/media_plugins/base/media_plugin_base.cpp

indra/media_plugins/base/media_plugin_base.h

indra/media_plugins/quicktime/media_plugin_quicktime.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_lad.xml

indra/newview/llagent.cpp

indra/newview/llagentui.cpp

indra/newview/llagentui.h

indra/newview/llappviewer.cpp