1 files changed, 61 insertions, 19 deletions
diff --git a/indra/llrender/lluiimage.inl b/indra/llrender/lluiimage.inl
index dff1fcdfcc..1915d0e7ce 100644
--- a/indra/llrender/lluiimage.inl
+++ b/indra/llrender/lluiimage.inl
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2026, Linden Research, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,30 +29,72 @@ void LLUIImage::draw(S32 x, S32 y, const LLColor4& color) const
     draw(x, y, getWidth(), getHeight(), color);
 }
 
+void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, bool solid_color) const
+{
+    if (sEnableDisplayListsCollection)
+    {
+        // Get display list for this configuration
+        buffer_data_list_t* display_list = findDisplayList(x, y, width, height, color, solid_color);
+
+        if (display_list && !display_list->empty())
+        {
+            // Deliberately empty pending verts.
+            // They aren't related to the iamge, so don't register them under draw
+            gGL.flush();
+            LL_PROFILE_ZONE_SCOPED;
+            gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
+
+            //gGL.pushUIMatrix();
+
+            if (solid_color)
+            {
+                gSolidColorProgram.bind();
+            }
+
+            gGL.color4fv(color.mV); // for the shader
+
+            // Replay the cached display list
+            for (LLVertexBufferData& buffer : *display_list)
+            {
+                buffer.draw();
+            }
+
+            if (solid_color)
+            {
+                gUIProgram.bind();
+            }
+            //gGL.popUIMatrix();
+        }
+        else
+        {
+            // Create, draw and capture display list.
+            // Basically a wrapper around gl_draw_scaled_image_with_border
+            // that records the output into a list.
+            genDisplayList(x, y, width, height, color, solid_color);
+        }
+    }
+    else
+    {
+        gl_draw_scaled_image_with_border(
+            x, y,
+            width, height,
+            mImage,
+            color,
+            solid_color,
+            mClipRegion,
+            mScaleRegion,
+            mScaleStyle == SCALE_INNER);
+    }
+}
+
 void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const
 {
-    gl_draw_scaled_image_with_border(
-        x, y,
-        width, height,
-        mImage,
-        color,
-        false,
-        mClipRegion,
-        mScaleRegion,
-        mScaleStyle == SCALE_INNER);
+    draw(x, y, width, height, color, false);
 }
 
 void LLUIImage::drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const
 {
-    gl_draw_scaled_image_with_border(
-        x, y,
-        width, height,
-        mImage,
-        color,
-        true,
-        mClipRegion,
-        mScaleRegion,
-        mScaleStyle == SCALE_INNER);
+    draw(x, y, width, height, color, true);
 }
 
 void LLUIImage::drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const