summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-07-19 22:20:45 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-07-19 22:20:45 +0300
commit2ded530f931f89390162ea9b2126a7339f87e884 (patch)
treefb2c39f93db37f61d5837079c4214232034cd052 /indra/llimage
parent7f19c512c9593dd925467a2bc75ad4cf0c3dbca9 (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge branch 'master' into DRTVWR-522-maint
# Conflicts: # doc/contributions.txt # indra/newview/llappcorehttp.cpp # indra/newview/llappcorehttp.h
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index 293ada7548..28b8e8c06d 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -11,6 +11,7 @@ include(LLKDU)
include(LLImageJ2COJ)
include(ZLIB)
include(LLAddBuildTest)
+include(bugsplat)
include(Tut)
include_directories(