Merge remote-tracking branch 'upstream/master'

Conflicts: indra/llrender/llshadermgr.cpp (resolved)
2013-10-06 10:32:23 -04:00
parent f6861cd5ba 85f4fa9000
commit 7ab20726e4
28 changed files with 255 additions and 288 deletions
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -56,14 +56,7 @@ LLShaderMgr::LLShaderMgr()
 {
 	{
 		const std::string dumpdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"shader_dump")+gDirUtilp->getDirDelimiter();
-		/*try 
-		{
-			boost::filesystem::remove_all(dumpdir);
-		}
-		catch(const boost::filesystem::filesystem_error& e)
-		{
-			llinfos << "boost::filesystem::remove_all(\""+dumpdir+"\") failed: '" + e.code().message() + "'" << llendl;
-		}*/
+		gDirUtilp->deleteDirAndContents(dumpdir);
 	}
 }