diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-23 23:26:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 23:26:54 +0300 |
| commit | 38916ebf367aa400d8151d78204e714d40e8c323 (patch) | |
| tree | 2fe671253d83620fba0e0b1c6c488997b558a7ef /indra/llimage/llimage.h | |
| parent | 4274eb591a1b0806f8c73ca16df65ade60db2200 (diff) | |
| parent | 0b7548c6b69f8259aae987c479a85a9d0fd04d89 (diff) | |
Merge pull request #2657 from secondlife/marchcat/b-develop
develop → Maint B sync
Diffstat (limited to 'indra/llimage/llimage.h')
| -rw-r--r-- | indra/llimage/llimage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h index 8b966b8ea3..6b14b68c78 100644 --- a/indra/llimage/llimage.h +++ b/indra/llimage/llimage.h @@ -179,7 +179,7 @@ private: public: template<bool SHARED> - class DataLock : LLSharedMutexLockTemplate<SHARED> + class DataLock : public LLSharedMutexLockTemplate<SHARED> { public: DataLock(const LLImageBase* image) |