From 3d42d2ebeaf71dd46dacf01dd526b3850682a23c Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 8 Nov 2022 16:42:59 +0000 Subject: [PATCH] fspefstats switcharoo with LL version but keep fs perf floater. --- indra/newview/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c07e233661..c51e1130a2 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -409,8 +409,8 @@ set(viewer_SOURCE_FILES llfloaterpathfindinglinksets.cpp llfloaterpathfindingobjects.cpp llfloaterpay.cpp - # llfloaterperformance.cpp replaced with fs version due to large changes and likelihood that LL version will not release. - fsfloaterperformance.cpp + # llfloaterperformance.cpp + fsfloaterperformance.cpp # restore fs perf floater llfloaterperms.cpp llfloaterpostprocess.cpp llfloaterprofile.cpp @@ -1698,10 +1698,6 @@ configure_file( list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/fsversionvalues.h) # - # Performance stast support - list(APPEND viewer_SOURCE_FILES fsperfstats.cpp) - list(APPEND viewer_HEADER_FILES fsperfstats.h) - # source_group("CMake Rules" FILES ViewerInstall.cmake) #build_data.json creation moved to viewer_manifest.py MAINT-6413