From 5aafde27ea046daada1f89f0be17e2f2336e8e87 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@bred.dog>
Date: Tue, 18 Aug 2020 16:22:53 -0400
Subject: [PATCH] Fix build error from merge

---
 indra/llxml/llcontrol.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index 4bc76802f83..54f90b6a741 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -67,6 +67,7 @@ class LLVector3;
 class LLVector3d;
 class LLQuaternion;
 class LLColor4;
+class LLColor4U;
 class LLColor3;
 
 // if this is changed, also modify mTypeString in llcontrol.h
-- 
GitLab