merge

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/newview/llfloatergodtools.cpp

indra/newview/llfloaterland.cpp

indra/newview/llfloaternamedesc.cpp

indra/newview/llfloaterproperties.cpp

indra/newview/llfolderview.cpp

indra/newview/llpanelgroupgeneral.cpp

indra/newview/llpanellogin.cpp

indra/newview/llpanelpermissions.cpp

indra/newview/llpreviewanim.cpp

indra/newview/llpreviewgesture.cpp

indra/newview/llpreviewnotecard.cpp

indra/newview/llpreviewscript.cpp

indra/newview/llpreviewsound.cpp

indra/newview/llpreviewtexture.cpp

indra/newview/llsidepaneliteminfo.cpp

indra/newview/llsidepaneltaskinfo.cpp

...newview/skins/default/xui/en/floater_test_line_editor.xml

indra/newview/skins/default/xui/en/floater_tools.xml