diff --git a/autobuild.xml b/autobuild.xml index d8cebeb19f..91f914d385 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -398,9 +398,9 @@ archive hash - 40b1c6b3727ebedafc2f1a172797ccd1 + 8fff9c2948517b8d3f512d58bbdf276f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-curl-update/rev/295367/arch/Darwin/installer/curl-7.38.0-darwin-20141010.tar.bz2 + file:///opt/firestorm/curl-7.38.0.0-darwin-20150118.tar.bz2 name darwin diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index afdc71562b..085d91416a 100755 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -684,9 +684,11 @@ std::vector* LLFilePicker::navOpenFilterProc(ELoadFilter filter) // allowedv->push_back("dic"); allowedv->push_back("xcu"); break; - case FFLOAD_XML: - allowedv->push_back("xml"); - break; + // Compile fix + // case FFLOAD_XML: + // allowedv->push_back("xml"); + // break; + // Compile fix case FFLOAD_DIRECTORY: break; // Import filter @@ -786,12 +788,13 @@ bool LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filena extension = "slg"; break; #endif - - case FFSAVE_XML: - type = "\?\?\?\?"; - creator = "\?\?\?\?"; - extension = "xml"; - break; + // Compile fix + // case FFSAVE_XML: + // type = "\?\?\?\?"; + // creator = "\?\?\?\?"; + // extension = "xml"; + // break; + // Compile fix case FFSAVE_RAW: type = "\?\?\?\?";