diff -r 959f9340da92 -r 80337908154a doc/contributions.txt
--- a/doc/contributions.txt	Fri Dec 17 22:16:14 2010 +0200
+++ b/doc/contributions.txt	Thu Jul 21 17:03:03 2011 +0200
@@ -178,6 +178,7 @@
 blino Nakamura
 	VWR-17
 Boroondas Gupte
+	OPEN-67
 	SNOW-278
 	SNOW-503
 	SNOW-510
diff -r 959f9340da92 -r 80337908154a indra/llvfs/lldiriterator.cpp
--- a/indra/llvfs/lldiriterator.cpp	Fri Dec 17 22:16:14 2010 +0200
+++ b/indra/llvfs/lldiriterator.cpp	Thu Jul 21 17:03:03 2011 +0200
@@ -26,6 +26,17 @@
 
 #include "lldiriterator.h"
 
+/* Use version 3 of the Boost filesystem library.
+ * 
+ * The following #define has to come before <boost/filesystem.hpp> is
+ * included. Boost versions 1.44 through 1.47 will supply both V2 and
+ * V3 of the Boost filesystem library API. For the versions defaulting
+ * to V2 (1.44 and 1.45), the following #define forces the V3 API. From
+ * Boost version 1.46 on, V3 will be the default and the #define will
+ * not be needed anymore. (Though keeping it shouldn't hurt.)
+ */
+#define BOOST_FILESYSTEM_VERSION 3
+
 #include <boost/filesystem.hpp>
 #include <boost/regex.hpp>
 
@@ -64,7 +75,7 @@
 	{
 		mIter = fs::directory_iterator(dir_path);
 	}
-	catch (fs::basic_filesystem_error<fs::path>& e)
+	catch (fs::filesystem_error& e)
 	{
 		llerrs << e.what() << llendl;
 		return;
@@ -109,7 +120,7 @@
 	while (mIter != end_itr && !found)
 	{
 		boost::smatch match;
-		std::string name = mIter->path().filename();
+		std::string const name = mIter->path().filename().generic_string();
 		if (found = boost::regex_match(name, match, mFilterExp))
 		{
 			fname = name;