Merge

etc/message.xml

indra/newview/CMakeLists.txt

indra/newview/app_settings/commands.xml

indra/newview/llfloaterpathfindingbasic.cpp

indra/newview/llfloaterpathfindingconsole.cpp

indra/newview/llfloaterpathfindingconsole.h

indra/newview/llfloaterpathfindinglinksets.cpp

indra/newview/llfloaterpathfindinglinksets.h

indra/newview/llfloatertools.cpp

indra/newview/lllocationinputctrl.cpp

indra/newview/lllocationinputctrl.h

indra/newview/llpanelcontents.cpp

indra/newview/llpanelface.cpp

indra/newview/llpanelnavmeshrebake.cpp

indra/newview/llpanelnavmeshrebake.h

indra/newview/llpanelobject.cpp

indra/newview/llpanelobject.h

indra/newview/llpanelpermissions.cpp

indra/newview/llpanelvolume.cpp

indra/newview/llpathfindingcharacterlist.cpp