diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-02-02 15:49:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-02-02 15:49:16 -0500 |
| commit | 1925fd2b8b9216e5d9388e6a0c077c99aa782cad (patch) | |
| tree | 2507c9889eb825302f7c3f1650b85e6208b04e4e /indra/llcommon/llinitparam.cpp | |
| parent | 7f544db197fcaa8a697ee9d9694d11b297a20266 (diff) | |
| parent | 080744d8990e6b18a80858803a20a5ec87020d82 (diff) | |
merge changes for 5.0.1-release
Diffstat (limited to 'indra/llcommon/llinitparam.cpp')
| -rw-r--r-- | indra/llcommon/llinitparam.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llcommon/llinitparam.cpp b/indra/llcommon/llinitparam.cpp index aa2f4eb289..1d104cf55d 100644 --- a/indra/llcommon/llinitparam.cpp +++ b/indra/llcommon/llinitparam.cpp @@ -193,7 +193,12 @@ namespace LLInitParam { if (!silent) { - p.parserWarning(llformat("Failed to parse parameter \"%s\"", p.getCurrentElementName().c_str())); + 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())); } return false; } |