From 0f64501a523e7230986f176490e20fcbc023dc5a Mon Sep 17 00:00:00 2001 From: humbletim Date: Sat, 12 Oct 2024 23:13:18 -0400 Subject: [PATCH] sgeo-7.1.10 alternate strategy 2.6 --- sgeo-7.1.10/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sgeo-7.1.10/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch b/sgeo-7.1.10/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch index 38ae413dce..dc25799786 100644 --- a/sgeo-7.1.10/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch +++ b/sgeo-7.1.10/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch @@ -119,8 +119,8 @@ diff -ur --binary '--exclude=.git' ../Firestormx/indra/newview/llviewercamera.h F32 getDefaultFOV() { return mCameraFOVDefault; } -======= + -- void setDefaultFOV(F32 fov) ; -- F32 getDefaultFOV() { return mCameraFOVDefault; } +- void setDefaultFOV(F32 fov) ; +- F32 getDefaultFOV() { return mCameraFOVDefault; } // P373R Sgeo @@ -103,7 +103,6 @@ void setHorizontalOffset(F32 offset) { mHorizontalOffset = offset; }