merge

indra/llcommon/llerror.cpp

indra/llcommon/llerror.h

indra/llcommon/llstring.h

indra/llcommon/tests/llerror_test.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

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/llnamelistctrl.cpp

indra/newview/llnamelistctrl.h

indra/newview/llnavigationbar.cpp

indra/newview/llpaneleditwearable.cpp

indra/newview/llpaneleditwearable.h