Merge

indra/llui/lliconctrl.cpp

indra/llui/lliconctrl.h

indra/llui/llui.cpp

indra/llui/llui.h

indra/newview/llavatariconctrl.cpp

indra/newview/llfloaterland.cpp

indra/newview/llsidetray.cpp

indra/newview/llsidetray.h

indra/newview/llviewertexture.cpp

indra/newview/llviewertexture.h

indra/newview/llviewertexturelist.cpp

indra/newview/llviewertexturelist.h

indra/newview/llworldmapview.cpp

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

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

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