From 565d2e1389b0a72e6eca7068988a9312991abfb1 Mon Sep 17 00:00:00 2001
From: elektrahesse
Date: Sat, 9 Oct 2010 19:05:40 +0200
Subject: Mac Only: Implemented initial CoreGraphics image decoding to support
 uploads, both single and bulk, bypassing viewer's internal decoding classes
 and using osx native frameworks. Also pushing non-fully-working-yet (and thus
 disabled) code for native j2c decoding.

---
 linden/indra/llcommon/stdtypes.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'linden/indra/llcommon')

diff --git a/linden/indra/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h
index af0b4dd..aed1e46 100644
--- a/linden/indra/llcommon/stdtypes.h
+++ b/linden/indra/llcommon/stdtypes.h
@@ -64,10 +64,17 @@ typedef long long unsigned int		U64;
 #endif
 #endif
 
+#ifdef LL_DARWIN
+	#ifndef BOOL
+		#define BOOL S32
+	#endif
+#else
+	typedef S32				BOOL;
+#endif
+
 typedef float				F32;
 typedef double				F64;
 
-typedef S32				BOOL;
 typedef U8				KEY;
 typedef U32				MASK;
 typedef U32             		TPACKETID;
-- 
cgit v1.1


From 00587735f3d7cc5914e8f75da3de863c2dabaf72 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 16 Oct 2010 16:23:42 -0700
Subject: Ported memory leak fix in llcommon/llstring.h from the Ascent Viewer

---
 linden/indra/llcommon/llstring.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linden/indra/llcommon')

diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 7db62bc..3c6cd43 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -870,6 +870,7 @@ void LLStringUtilBase<T>::addCRLF(std::basic_string<T>& string)
 		}
 
 		string.assign(t, size);
+		delete[] t;
 	}
 }
 
-- 
cgit v1.1