diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-21 11:30:48 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-21 11:30:48 +0300 |
commit | f77a30f740b233a0941ff0b78558712ea796c51d (patch) | |
tree | 0a997a539bdebbf5d1ed646a6e42b29fbb43d64d /indra/llmessage/llbuffer.cpp | |
parent | 383352c61c5e20bdd7fe4be31bc227cfb62c4bc6 (diff) | |
parent | 72423372d6cd7f763a5567ad75752fa4e7131d60 (diff) |
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# autobuild.xml
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()) |