Skip to content

Commit

Permalink
sgeo-7.1.10 alternate strategy 2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
humbletim committed Oct 13, 2024
1 parent ecad065 commit 0f64501
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sgeo-7.1.10/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down

0 comments on commit 0f64501

Please sign in to comment.