diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
commit | 8153e7d63923a0022ffc1d6f526d4be57d34ba3d (patch) | |
tree | 596d38d591177ccc2ffef695b6f79437c5efce97 /indra/llmessage/llbuffer.cpp | |
parent | 6362aa300766484909cdfc8884edf3e6744fc727 (diff) | |
parent | 19d063952c4706d4344f207775aa5dfdff8802fd (diff) |
Merged in merge-6.4.6 (pull request #207)
Merge master 6.4.6 into DRTVWR-510 (VS2017 update)
Diffstat (limited to 'indra/llmessage/llbuffer.cpp')
-rw-r--r-- | indra/llmessage/llbuffer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp index 1a0eceba0f..cfe38605ad 100644 --- a/indra/llmessage/llbuffer.cpp +++ b/indra/llmessage/llbuffer.cpp @@ -32,6 +32,7 @@ #include "llmath.h" #include "llstl.h" #include "llthread.h" +#include "llmutex.h" #include <iterator> #define ASSERT_LLBUFFERARRAY_MUTEX_LOCKED() llassert(!mMutexp || mMutexp->isSelfLocked()) |