merge from PE's viewer-release. conflicts resolved.

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltextutil.cpp

indra/llui/lltextutil.h

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/newview/llappviewer.cpp

indra/newview/llcofwearables.cpp

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanelimcontrolpanel.h

indra/newview/llpanelmaininventory.cpp

indra/newview/llpaneloutfitedit.cpp

indra/newview/llsidepanelinventory.h

indra/newview/llwearableitemslist.cpp

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

...view/skins/default/xui/en/menu_inventory_gear_default.xml

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

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