diff --git a/XCODE_6_UPGRADES_TODO.txt b/XCODE_6_UPGRADES_TODO.txt
index 1529a2ee90c96ed5bd8b90129b129cf21c1f68a4..89b95c583638257e5e0ad0d2311fe643f53daca8 100644
--- a/XCODE_6_UPGRADES_TODO.txt
+++ b/XCODE_6_UPGRADES_TODO.txt
@@ -1,13 +1,9 @@
-* Remove references to Xcode < 6 from CMake (and everywhere else I guess)
-
-* /Users/callum/work/Linden/viewer-tools-update-callum/indra/llcommon/llpredicate.h:144:17 trying to decipher correct code here. (via Richard)
+* Build with tests on (LL_TESTS:BOOL=ON) and fix
 
 * Missed off some #if LL_DARWINs around #pragmas to turn off non-useful warnings for OS X - will fix when build Windows viewer
 
 * Remove explicit code to turn off unused funcs for tut.hpp (#pragma clang diagnostic ignored "-Wunused-function") - I moved it to package itself
 
-* Port llQtWebKit with SSL3/TLS fix to hacked version and include in autobuild (Oz)
-
 * Fix up commented out code in 'tut' package - tut/tut/tut_assert.hpp #82 & #84 (no operator << for T & Q)
 
 * Fix llphysicsextension:
@@ -15,6 +11,9 @@
 	* remove unused variables 78-81
 	* remove pointer to hacked version in vewer autobuild.xml
 
-* clang demands default ctor here: https://bitbucket.org/callum_linden/viewer-tools-update-callum/src/c58560da7bb6e00deffcbbc1c25cbf87bf2e96ec/indra/newview/llgrouplist.cpp?at=default#cl-53   side effects?
-
 * Nat to look at this please: https://bitbucket.org/callum_linden/viewer-tools-update-callum/commits/3d2fb85943d527e7db9908ff2824bc54afe916f1
+
+* Rebuild with CMake 3.0.2
+
+* Remove -Wno-sign-compare from indra/cmake/00-Common.cmake and see if it builds.  (Why did this switched off still catch U32 v; if ( v < 0 ) {  })
+
diff --git a/indra/llcommon/llpredicate.h b/indra/llcommon/llpredicate.h
index 91d96e64f5441f8299dac0ea8c2b9decccdde852..e6c56a5711b84bcb79bf09b8729532f0fc989e9e 100644
--- a/indra/llcommon/llpredicate.h
+++ b/indra/llcommon/llpredicate.h
@@ -139,10 +139,9 @@ namespace LLPredicate
 		Rule()
 		{}
 
-		void require(ENUM e)
+		void require(ENUM e, bool match)
 		{
-			// TEMP XCODE6FIX checkin while i figure out what the heck this is supposed to mean
-			// mRule.set(e, require);
+			mRule.set(e, match);
 		}
 
 		void allow(ENUM e)