diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-05 17:12:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-05 17:12:42 -0500 |
| commit | bf2e3fca73b80afa10a1c913ba752fcaf79ccd19 (patch) | |
| tree | 12a8ae6dd43c065b6ebc91f4b3ad1e29eade4c7f /indra/newview/llfilepicker.cpp | |
| parent | 44f5d7320952de2c4c7e1062b1c02c2f521400fa (diff) | |
| parent | 6d48db868f7459fcf5f0e89d830a844e409d4163 (diff) | |
merge changes for 3.7.22-release
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rwxr-xr-x | indra/newview/llfilepicker.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 5debf71744..ef50594feb 100755 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -600,6 +600,9 @@ std::vector<std::string>* LLFilePicker::navOpenFilterProc(ELoadFilter filter) // allowedv->push_back("slg"); break; #endif + case FFLOAD_XML: + allowedv->push_back("xml"); + break; case FFLOAD_RAW: allowedv->push_back("raw"); break; @@ -702,7 +705,14 @@ bool LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filena creator = "\?\?\?\?"; extension = "slg"; break; -#endif +#endif + + case FFSAVE_XML: + type = "\?\?\?\?"; + creator = "\?\?\?\?"; + extension = "xml"; + break; + case FFSAVE_RAW: type = "\?\?\?\?"; creator = "\?\?\?\?"; @@ -1100,6 +1110,12 @@ static std::string add_anim_filter_to_gtkchooser(GtkWindow *picker) return filtername; } +static std::string add_xml_filter_to_gtkchooser(GtkWindow *picker) +{ + return add_simple_pattern_filter_to_gtkchooser(picker, "*.xml", + LLTrans::getString("xml_files") + " (*.xml)"); +} + static std::string add_collada_filter_to_gtkchooser(GtkWindow *picker) { return add_simple_pattern_filter_to_gtkchooser(picker, "*.dae", @@ -1293,6 +1309,9 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter, bool blocking ) case FFLOAD_ANIM: filtername = add_anim_filter_to_gtkchooser(picker); break; + case FFLOAD_XML: + filtername = add_xml_filter_to_gtkchooser(picker); + break; case FFLOAD_COLLADA: filtername = add_collada_filter_to_gtkchooser(picker); break; |