merge from PE's viewer-trunk

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llcofwearables.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventoryfunctions.cpp

indra/newview/llinventoryitemslist.cpp

indra/newview/llinventoryitemslist.h

indra/newview/llnavigationbar.cpp

indra/newview/llpaneltopinfobar.cpp

indra/newview/llpaneltopinfobar.h

indra/newview/llviewercontrol.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llwearableitemslist.cpp

indra/newview/llwearableitemslist.h

indra/newview/skins/default/textures/textures.xml

...view/skins/default/textures/windows/Wearables_Divider.png

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