diff options
| author | Nemurimasu Neiro | 2010-08-24 00:43:56 +0000 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-28 07:08:52 -0700 |
| commit | 214ac11fc4117c926dafdadd476c0e767c04ee64 (patch) | |
| tree | 1616f13b570757ac4472540fd7cf69e7f23228da | |
| parent | Fixed width on first use grid selector being too small (diff) | |
| download | meta-impy-214ac11fc4117c926dafdadd476c0e767c04ee64.zip meta-impy-214ac11fc4117c926dafdadd476c0e767c04ee64.tar.gz meta-impy-214ac11fc4117c926dafdadd476c0e767c04ee64.tar.bz2 meta-impy-214ac11fc4117c926dafdadd476c0e767c04ee64.tar.xz | |
bulk upload supports .png too
| -rw-r--r-- | linden/indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp index e3b9769..a18201b 100644 --- a/linden/indra/newview/llviewermenufile.cpp +++ b/linden/indra/newview/llviewermenufile.cpp | |||
| @@ -794,7 +794,7 @@ void upload_new_resource(const std::string& src_filename, std::string name, | |||
| 794 | { | 794 | { |
| 795 | // Unknown extension | 795 | // Unknown extension |
| 796 | // *TODO: Translate? | 796 | // *TODO: Translate? |
| 797 | error_message = llformat("Unknown file extension .%s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh", exten.c_str()); | 797 | error_message = llformat("Unknown file extension .%s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, .png, or .bvh", exten.c_str()); |
| 798 | error = TRUE;; | 798 | error = TRUE;; |
| 799 | } | 799 | } |
| 800 | 800 | ||