merge

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/llui/llurlregistry.cpp

indra/llui/tests/llurlentry_test.cpp

indra/newview/installers/darwin/firstlook-dmg/_DS_Store

...ewview/installers/darwin/fix_application_icon_position.sh

indra/newview/installers/darwin/publicnightly-dmg/_DS_Store

indra/newview/installers/darwin/release-dmg/_DS_Store

.../newview/installers/darwin/releasecandidate-dmg/_DS_Store

indra/newview/llbottomtray.cpp

indra/newview/llchathistory.cpp

indra/newview/lldrawable.h

indra/newview/llfavoritesbar.cpp

indra/newview/llfavoritesbar.h

indra/newview/llfloateranimpreview.cpp

indra/newview/llfloaterland.cpp