Merge from remote repo

.hgignore

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginprocessparent.cpp

indra/llui/llscrollcontainer.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/media_plugins/quicktime/media_plugin_quicktime.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llchathistory.cpp

indra/newview/lldrawpool.cpp

indra/newview/llface.cpp

indra/newview/llfloaterchat.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloatertools.cpp