Merge my changes with rev. 2603

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/llui/lluicolortable.cpp

indra/llui/lluicolortable.h

indra/newview/llagentwearables.cpp

indra/newview/llcapabilitylistener.cpp

indra/newview/llcapabilitylistener.h

indra/newview/llcapabilityprovider.h

indra/newview/llface.inl

indra/newview/llfloaterbuyland.cpp

indra/newview/llviewerparcelmgr.cpp

indra/newview/llviewerparcelmgr.h

indra/newview/llwearable.cpp

...iew/skins/default/xui/en/panel_media_settings_general.xml

indra/newview/skins/default/xui/en/widgets/tab_container.xml

indra/newview/tests/llcapabilitylistener_test.cpp