Added missing header to indra/newview/ascentkeyword.cpp now that llviewerpluginmanager.h has a couple of header dependencies less. Resolved Conflicts: indra/llcommon/CMakeLists.txt Proximity: addition of two independent things. Just included both.