From ac8da149ccd45bc7e2720eea8a585a5e19f98adc Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Sat, 20 Oct 2012 21:12:43 -0600
Subject: [PATCH] FIRE-5782: Fix build on OSX

---
 indra/newview/llfilepicker.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 410bbec1ae..760b6021bd 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -996,7 +996,10 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter, bool blocking)
 	return success;
 }
 
-BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
+// <FS:CR Threaded Filepickers>
+//BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
+BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
+// </FS:CR Threaded Filepickers>
 {
 	if( mLocked )
 		return FALSE;
@@ -1041,7 +1044,10 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
 	return success;
 }
 
-BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
+// <FS:CR Threaded Filepickers>
+//BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
+BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename, bool blocking)
+// </FS:CR Threaded Filepickers>
 {
 	if( mLocked )
 		return FALSE;