2 files changed, 6 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)
diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp
index bfcb1f76de..3b12aa39e4 100644
--- a/indra/llimage/llimagefilter.cpp
+++ b/indra/llimage/llimagefilter.cpp
@@ -389,6 +389,11 @@ void LLImageFilter::convolve(const LLMatrix3 &kernel, bool normalize, bool abs_v
 
     S32 buffer_size = width * components;
     llassert_always(buffer_size > 0);
+
+    // ND: GCC womtimes is unable to figure out llassert_always (aka LLERROR_CRASH) will never return.
+    // This return here is just a dummy and will not be reached.
+    if( buffer_size == 0 ){return; }
+
     std::vector<U8> even_buffer(buffer_size);
     std::vector<U8> odd_buffer(buffer_size);