merge

build.sh

indra/newview/CMakeLists.txt

indra/newview/llfloaterpathfindingcharacters.cpp

indra/newview/llfloaterpathfindingcharacters.h

indra/newview/llfloaterpathfindinglinksets.cpp

indra/newview/llfloaterpathfindinglinksets.h

indra/newview/llfloaterpathfindingobjects.cpp

indra/newview/llfloaterpathfindingobjects.h

indra/newview/lllocationinputctrl.cpp

indra/newview/llpathfindingmanager.cpp

indra/newview/llpathfindingmanager.h

indra/newview/llstartup.cpp

...view/skins/default/textures/icons/Pathfinding_Dynamic.png

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

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