livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm

master
Ansariel 2025-10-13 10:59:05 +02:00
parent 1368aeeef6 4855714b46
commit d5175720c9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llwebrtc/CMakeLists.txt
View File

@ -23,6 +23,7 @@ set(llwebrtc_HEADER_FILES
list(APPEND llwebrtc_SOURCE_FILES ${llwebrtc_HEADER_FILES}) list(APPEND llwebrtc_SOURCE_FILES ${llwebrtc_HEADER_FILES})
add_library (llwebrtc SHARED ${llwebrtc_SOURCE_FILES}) add_library (llwebrtc SHARED ${llwebrtc_SOURCE_FILES})
set_target_properties(llwebrtc PROPERTIES PUBLIC_HEADER llwebrtc.h) set_target_properties(llwebrtc PROPERTIES PUBLIC_HEADER llwebrtc.h)
if (WINDOWS) if (WINDOWS)
@ -52,11 +53,10 @@ elseif (DARWIN)
XCODE_ATTRIBUTE_DWARF_DSYM_FOLDER_PATH "${SYMBOLS_STAGING_DIR}/dSYMs") XCODE_ATTRIBUTE_DWARF_DSYM_FOLDER_PATH "${SYMBOLS_STAGING_DIR}/dSYMs")
endif (USE_BUGSPLAT) endif (USE_BUGSPLAT)
elseif (LINUX) elseif (LINUX)
target_compile_options(llwebrtc PRIVATE "-Wno-deprecated-declarations")
target_link_libraries(llwebrtc PRIVATE ll::webrtc) target_link_libraries(llwebrtc PRIVATE ll::webrtc)
endif (WINDOWS) endif (WINDOWS)
target_include_directories( llwebrtc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories( llwebrtc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
if (WINDOWS) if (WINDOWS)
set_property(TARGET llwebrtc PROPERTY set_property(TARGET llwebrtc PROPERTY

4
indra/newview/lloutfitslist.cpp
View File

@ -1167,8 +1167,8 @@ void LLOutfitListBase::onIdleRefreshList()
} }
// <FS:PP> Scale MAX_TIME with FPS to avoid overloading the viewer with function calls at low frame rates // <FS:PP> Scale MAX_TIME with FPS to avoid overloading the viewer with function calls at low frame rates
// const F64 MAX_TIME = 0.05f; // const F64 MAX_TIME = 0.005f;
F64 MAX_TIME = 0.05f; F64 MAX_TIME = 0.005f;
constexpr F64 min_time = 0.001f; constexpr F64 min_time = 0.001f;
constexpr F64 threshold_fps = 30.0; constexpr F64 threshold_fps = 30.0;
const auto current_fps = LLTrace::get_frame_recording().getPeriodMedianPerSec(LLStatViewer::FPS,10); const auto current_fps = LLTrace::get_frame_recording().getPeriodMedianPerSec(LLStatViewer::FPS,10);