1 files changed, 18 insertions, 0 deletions

diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 9d689b5..a725281 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -421,6 +421,12 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border
         stop_glerror();
         F32 border_scale = 1.f;
 
+        if (NULL == image)
+        {
+                llwarns << "image == NULL; aborting function" << llendl;
+                return;
+        }
+
         if (border_height * 2 > height)
         {
                 border_scale = (F32)height / ((F32)border_height * 2.f);
@@ -599,6 +605,12 @@ void gl_draw_rotated_image(S32 x, S32 y, F32 degrees, LLImageGL* image, const LL
 
 void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees, LLImageGL* image, const LLColor4& color)
 {
+        if (NULL == image)
+        {
+                llwarns << "image == NULL; aborting function" << llendl;
+                return;
+        }
+
         LLGLSUIDefault gls_ui;
 
         glPushMatrix();
@@ -639,6 +651,12 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 
 void gl_draw_scaled_image_inverted(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color)
 {
+        if (NULL == image)
+        {
+                llwarns << "image == NULL; aborting function" << llendl;
+                return;
+        }
+
         LLGLSUIDefault gls_ui;
 
         glPushMatrix();