Merge pull request #1019 from secondlife/vi-82

secondlife/viewer-issues#82: Don't allow transparent texture terrain

1 files changed, 22 insertions, 0 deletions

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index acfc254b65..16609b60be 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -990,6 +990,28 @@ void LLImageRaw::verticalFlip()
 }
 
 
+bool LLImageRaw::checkHasTransparentPixels()
+{
+    if (getComponents() != 4)
+    {
+        return false;
+    }
+
+    U8* data = getData();
+    U32 pixels = getWidth() * getHeight();
+
+    // check alpha channel for all 255
+    for (U32 i = 0; i < pixels; ++i)
+    {
+        if (data[i * 4 + 3] != 255)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 bool LLImageRaw::optimizeAwayAlpha()
 {
     if (getComponents() == 4)