merge

indra/llinventory/llpermissions.cpp

indra/llinventory/llpermissions.h

indra/llui/llsearcheditor.cpp

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llagentaccess.cpp

indra/newview/llagentaccess.h

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llcallfloater.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llchatitemscontainerctrl.h

indra/newview/llfloatercamera.cpp

indra/newview/llfloatercamera.h

indra/newview/llfloaterevent.cpp

indra/newview/llfloaterevent.h

indra/newview/llfolderview.cpp

indra/newview/llimfloatercontainer.cpp

indra/newview/llimview.cpp