diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 5bb197fc787bb5af10990d7d862bae020368ad67..5b77d50d12e05692e165e0406eb05abcd962cdc9 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -51,7 +51,7 @@ const int LL_ERR_NOERR = 0;
 #define SHOW_ASSERT
 #else // _DEBUG
 
-#ifdef LL_RELEASE_WITH_DEBUG_INFO
+#if defined(LL_RELEASE_WITH_DEBUG_INFO) || defined(RELEASE_SHOW_ASSERT)
 #define SHOW_ASSERT
 #endif // LL_RELEASE_WITH_DEBUG_INFO
 
@@ -67,10 +67,6 @@ const int LL_ERR_NOERR = 0;
 #define SHOW_INFO
 #endif
 
-#ifdef RELEASE_SHOW_ASSERT
-#define SHOW_ASSERT
-#endif
-
 #endif // !_DEBUG
 
 #define llassert_always_msg(func, msg) if (LL_UNLIKELY(!(func))) LL_ERRS() << "ASSERT (" << msg << ")" << LL_ENDL
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 7e447c7b5ff458640d41921d863371dc85dee735..11c9d6ca3996f4b8779eab3c000f180f1382de1a 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -121,7 +121,7 @@ bool LLVertexBuffer::sUseVAO = false;
 bool LLVertexBuffer::sPreferStreamDraw = false;
 LLVertexBuffer* LLVertexBuffer::sUtilityBuffer = nullptr;
 
-#if LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO
+#if LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO || defined(RELEASE_SHOW_ASSERT)
 static absl::flat_hash_set<U32> sActiveBufferNames;
 static absl::flat_hash_set<U32> sDeletedBufferNames;