automated merge viewer2.0->viewer2.0

indra/llui/llfloater.cpp

indra/llui/llfloaterreg.cpp

indra/llui/llfloaterreg.h

indra/llui/lllineeditor.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/llui/llurlregistry.cpp

indra/llui/tests/llurlentry_test.cpp

indra/newview/llchathistory.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llexpandabletextbox.cpp

indra/newview/llexpandabletextbox.h

indra/newview/llimfloatercontainer.cpp

indra/newview/llimfloatercontainer.h

indra/newview/llinspect.cpp

indra/newview/llinspect.h

indra/newview/llinspectavatar.cpp

indra/newview/llinspectobject.cpp