summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-14 14:44:23 -0500
committerOz Linden <oz@lindenlab.com>2010-12-14 14:44:23 -0500
commit3aa12e85f04f0608da5df05b2cbb01685ef62944 (patch)
tree02e78886d530c92e3eddf0f73f3eb7f8a5b641da /indra/newview/llviewermenufile.cpp
parentbae83c7eac98229271a6baf4c961fe167c74a597 (diff)
parenta702b34394e4b38b27338eb6d68d22b498984118 (diff)
merge fix(es) for storm-378
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
-rw-r--r--indra/newview/llviewermenufile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 237aa39e6e..fda291f3c1 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -507,7 +507,7 @@ void upload_new_resource(const std::string& src_filename, std::string name,
"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;
}
else if( exten == "bmp")