merge

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/lltextbase.cpp

indra/newview/app_settings/settings.xml

indra/newview/llchannelmanager.cpp

indra/newview/llfloatergodtools.cpp

indra/newview/llfloaterland.cpp

indra/newview/llfloatermap.cpp

indra/newview/llfloaternamedesc.cpp

indra/newview/llfloaterproperties.cpp

indra/newview/llfolderview.cpp

indra/newview/llimfloater.cpp

indra/newview/llimhandler.cpp

indra/newview/llimview.cpp

indra/newview/llmanip.cpp

indra/newview/llmaniprotate.cpp

indra/newview/llmediactrl.cpp

indra/newview/llnearbychat.cpp

indra/newview/llnetmap.cpp

indra/newview/llnetmap.h