diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-13 10:08:55 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-13 10:08:55 -0500 |
commit | 618249155ae333c64c693a0f7f38453f3c871787 (patch) | |
tree | db28a3725a4e099735d4ce457ecf90267f8401da /indra/newview/llviewermenufile.cpp | |
parent | 6f8ff871cdd0402d07800444f0524079fe02fac6 (diff) | |
parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
-rw-r--r-- | indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 10793bb46d..cd5c7fa1b3 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -621,7 +621,7 @@ LLUUID upload_new_resource( "No file extension for the file: '%s'\nPlease make sure the file has a correct file extension", short_name.c_str()); args["FILE"] = short_name; - upload_error(error_message, "NofileExtension", filename, args); + upload_error(error_message, "NoFileExtension", filename, args); return LLUUID(); } else if( exten == "bmp") |