livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fix for OS X.

Tonya Souther 2015-01-20 12:44:15 -06:00
parent 74c5e2c75d
commit e6130ff458
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.xml
View File

@ -398,9 +398,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>40b1c6b3727ebedafc2f1a172797ccd1</string>
<string>8fff9c2948517b8d3f512d58bbdf276f</string>
<key>url</key>
<string>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</string>
<string>file:///opt/firestorm/curl-7.38.0.0-darwin-20150118.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>

21
indra/newview/llfilepicker.cpp
View File

@ -684,9 +684,11 @@ std::vector<std::string>* LLFilePicker::navOpenFilterProc(ELoadFilter filter) //
allowedv->push_back("dic");
allowedv->push_back("xcu");
break;
case FFLOAD_XML:
allowedv->push_back("xml");
break;
// <FS:TS> Compile fix
// case FFLOAD_XML:
// allowedv->push_back("xml");
// break;
// </FS:TS> Compile fix
case FFLOAD_DIRECTORY:
break;
// <FS:CR> 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;
// <FS:TS> Compile fix
// case FFSAVE_XML:
// type = "\?\?\?\?";
// creator = "\?\?\?\?";
// extension = "xml";
// break;
// </FS:TS> Compile fix
case FFSAVE_RAW:
type = "\?\?\?\?";