diff options
author | Armin Weatherwax | 2010-02-19 13:15:39 +0100 |
---|---|---|
committer | Jacek Antonelli | 2010-02-22 00:54:42 -0600 |
commit | 0a9bdaed77836f02eb3196a369083a7c52271a2b (patch) | |
tree | e324c0b43c56f3b62bde5ac72bde1e289355adef | |
parent | Ignore HideFromEditor from settings.xml. (diff) | |
download | meta-impy-0a9bdaed77836f02eb3196a369083a7c52271a2b.zip meta-impy-0a9bdaed77836f02eb3196a369083a7c52271a2b.tar.gz meta-impy-0a9bdaed77836f02eb3196a369083a7c52271a2b.tar.bz2 meta-impy-0a9bdaed77836f02eb3196a369083a7c52271a2b.tar.xz |
Fixed Linux file picker not showing WAV files.
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/newview/llfilepicker.cpp | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index c4bb418..c665dbf 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,10 @@ | |||
1 | 2010-02-19 Armin Weatherwax <Armin.Weatherwax@gmail.com> | ||
2 | |||
3 | * Fixed Linux file picker not showing WAV files. | ||
4 | |||
5 | modified: linden/indra/newview/llfilepicker.cpp | ||
6 | |||
7 | |||
1 | 2010-02-18 Jacek Antonelli <jacek.antonelli@gmail.com> | 8 | 2010-02-18 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 9 | ||
3 | * Fixed #197: Windlight toolbar can't be hidden. | 10 | * Fixed #197: Windlight toolbar can't be hidden. |
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp index 6334688..7b4caa8 100644 --- a/linden/indra/newview/llfilepicker.cpp +++ b/linden/indra/newview/llfilepicker.cpp | |||
@@ -1090,8 +1090,13 @@ static std::string add_simple_mime_filter_to_gtkchooser(GtkWindow *picker, | |||
1090 | 1090 | ||
1091 | static std::string add_wav_filter_to_gtkchooser(GtkWindow *picker) | 1091 | static std::string add_wav_filter_to_gtkchooser(GtkWindow *picker) |
1092 | { | 1092 | { |
1093 | return add_simple_mime_filter_to_gtkchooser(picker, "audio/x-wav", | 1093 | GtkFileFilter *gfilter = gtk_file_filter_new(); |
1094 | LLTrans::getString("sound_files") + " (*.wav)"); | 1094 | gtk_file_filter_add_pattern(gfilter, "*.wav"); |
1095 | gtk_file_filter_add_mime_type(gfilter,"audio/x-wav");//not working | ||
1096 | |||
1097 | std::string filtername = LLTrans::getString("sound_files") + " (*.wav)"; | ||
1098 | add_common_filters_to_gtkchooser(gfilter, picker, filtername); | ||
1099 | return filtername; | ||
1095 | } | 1100 | } |
1096 | 1101 | ||
1097 | static std::string add_bvh_filter_to_gtkchooser(GtkWindow *picker) | 1102 | static std::string add_bvh_filter_to_gtkchooser(GtkWindow *picker) |