merged

indra/newview/llfloaterbulkpermission.cpp

indra/newview/llfloaterbulkpermission.h

indra/newview/llfloaterdaycycle.cpp

indra/newview/llfloaterdaycycle.h

indra/newview/llfloaterenvsettings.cpp

indra/newview/llfloaterenvsettings.h

indra/newview/llfloaterhardwaresettings.cpp

indra/newview/llfloaterhardwaresettings.h

indra/newview/llfloaterland.cpp

indra/newview/llfloaterland.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfloaterregioninfo.cpp

indra/newview/llfloaterregioninfo.h

indra/newview/llfloaterwater.cpp

indra/newview/llfloaterwater.h

indra/newview/llfloaterwindlight.cpp

indra/newview/llfloaterwindlight.h

indra/newview/llnavigationbar.h

indra/newview/llpanelgroup.cpp