diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-11 16:03:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-11 17:42:17 -0700 |
| commit | 9775d7ea10ff87d913b1ba361a9204f961cd9c3f (patch) | |
| tree | 949da961836c451557c809469e4a1ffe4e540b3b /indra/llimage | |
| parent | a7b0f9391146b42dd5cd5f47f845de81bfdb6820 (diff) | |
| parent | 0870539264f7263ed17464413ee0b69058d511f6 (diff) | |
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimage.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index acd382d9a8..ca8a4199e8 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1928,7 +1928,6 @@ void LLImageRaw::compositeRowScaled4onto3( const U8* in, U8* out, S32 in_pixel_l } } - void LLImageRaw::addEmissive(LLImageRaw* src) { LLImageRaw* dst = this; // Just for clarity. @@ -1994,7 +1993,6 @@ void LLImageRaw::addEmissiveScaled(LLImageRaw* src) dst->addEmissiveUnscaled(&temp); } -// static bool LLImageRaw::validateSrcAndDst(std::string func, const LLImageRaw* src, const LLImageRaw* dst) { LLImageDataSharedLock lockIn(src); |