diff options
author | Oz Linden <oz@lindenlab.com> | 2017-10-11 09:13:55 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-10-11 09:13:55 -0400 |
commit | d62ad1ef8afc1b9abadbc611d373a7a7d9afc368 (patch) | |
tree | 9f14b141e692c3b78eee846f12fc021feacf1de6 /indra/llcommon/llinitparam.cpp | |
parent | c0ac11e24022eb51918e825414f2c04f3085bc61 (diff) | |
parent | b6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff) |
merge changes for 5.0.8-release
Diffstat (limited to 'indra/llcommon/llinitparam.cpp')
-rw-r--r-- | indra/llcommon/llinitparam.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llcommon/llinitparam.cpp b/indra/llcommon/llinitparam.cpp index 1d104cf55d..aa2f4eb289 100644 --- a/indra/llcommon/llinitparam.cpp +++ b/indra/llcommon/llinitparam.cpp @@ -193,12 +193,7 @@ namespace LLInitParam { if (!silent) { - std::string file_name = p.getCurrentFileName(); - if(!file_name.empty()) - { - file_name = "in file: " + file_name; - } - p.parserWarning(llformat("Failed to parse parameter \"%s\" %s", p.getCurrentElementName().c_str(), file_name.c_str())); + p.parserWarning(llformat("Failed to parse parameter \"%s\"", p.getCurrentElementName().c_str())); } return false; } |