diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-21 11:54:25 +0300 | 
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-21 11:54:25 +0300 | 
| commit | 8c3b4685317eb03b9d5d14447528659cf538e43f (patch) | |
| tree | 8f490ddb929934449b27c0e491d48287f8757217 /indra/llplugin | |
| parent | 6c17533dddf2d93ead2272c6a6ba588c5ab7e769 (diff) | |
| parent | 72423372d6cd7f763a5567ad75752fa4e7131d60 (diff) | |
Merge branch 'master' into DRTVWR-515-maint
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginmessagepipe.h | 1 | ||||
| -rw-r--r-- | indra/llplugin/slplugin/CMakeLists.txt | 1 | 
2 files changed, 2 insertions, 0 deletions
| diff --git a/indra/llplugin/llpluginmessagepipe.h b/indra/llplugin/llpluginmessagepipe.h index c3498beac0..9d5835eb82 100644 --- a/indra/llplugin/llpluginmessagepipe.h +++ b/indra/llplugin/llpluginmessagepipe.h @@ -31,6 +31,7 @@  #include "lliosocket.h"  #include "llthread.h" +#include "llmutex.h"  class LLPluginMessagePipe; diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index 33520ad64c..e4f64448c5 100644 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt @@ -63,6 +63,7 @@ set_target_properties(SLPlugin  endif ()  target_link_libraries(SLPlugin +  ${LEGACY_STDIO_LIBS}    ${LLPLUGIN_LIBRARIES}    ${LLMESSAGE_LIBRARIES}    ${LLCOMMON_LIBRARIES} | 
