summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-10-04 09:31:19 +0800
committerErik Kundiman <erik@megapahit.org>2023-10-04 09:31:19 +0800
commite18912bf3d8d6e5e962c054739a6d1cf51e991b5 (patch)
treee1ceab7b5abfb69869dcf8439f9dfda6753c3d23 /indra
parent5daccb743f50c7bca066d737ee18295ed38279de (diff)
parentd96266ca7edd876cad2a1708aca9a6e6ef86972f (diff)
Merge branch 'main' into DRTVWR-559
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 1adee0c08c..942902b393 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1965,6 +1965,8 @@ endif()
set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
"Path to artwork files.")
+set_source_files_properties(llinventorygallery.cpp PROPERTIES COMPILE_FLAGS
+ -Wno-unused-but-set-variable)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set_source_files_properties(llappviewerlinux.cpp PROPERTIES
COMPILE_FLAGS -Wno-dangling-gsl