From 15a1736ea342fcb71689578466f82590c9b3ee42 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Sat, 12 Oct 2024 21:23:15 -0400
Subject: [PATCH] sgeo-7.1.10 alternate strategy 2.3

---
 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 4a1bec995d..e9dcdfca46 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
@@ -1,7 +1,7 @@
 diff -ur --binary '--exclude=.git' ../Firestormx/indra/llrender/llrendertarget.h ./indra/llrender/llrendertarget.h
 --- ../Firestormx/indra/llrender/llrendertarget.h	2024-10-13 00:20:15.021678600 +0000
 +++ ./indra/llrender/llrendertarget.h	2024-10-13 00:14:01.000000000 +0000
-@@ -144,16 +144,13 @@
+@@ -144,16 +144,12 @@
  
      LLTexUnit::eTextureType getUsage(void) const { return mUsage; }
  
@@ -13,7 +13,7 @@ diff -ur --binary '--exclude=.git' ../Firestormx/indra/llrender/llrendertarget.h
  	U32 getFBO();
  	// END P373R Sgeo
  
- 	U32 getDepth(void) const { return mDepth; }
+- 	U32 getDepth(void) const { return mDepth; }
 ->>>>>>> sgeo/VR_Sgeo_2024
  
      U32 getDepth(void) const { return mDepth; }