diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
| commit | d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 (patch) | |
| tree | 56b3723fed44031e888de9019b1ad127acdb1806 /indra/llcommon/llerror.cpp | |
| parent | e1e1212daae33723e7da325f295a5c3a6bb78979 (diff) | |
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
Diffstat (limited to 'indra/llcommon/llerror.cpp')
| -rw-r--r-- | indra/llcommon/llerror.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 057b1bb417..13bf368334 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -1006,15 +1006,18 @@ namespace LLError << "(" << site.mLine << ") : "; } + if (message.find(functionName(site.mFunction)) == std::string::npos) + { #if LL_WINDOWS - // DevStudio: __FUNCTION__ already includes the full class name + // DevStudio: __FUNCTION__ already includes the full class name #else - if (site.mClassInfo != typeid(NoClassInfo)) - { - prefix << className(site.mClassInfo) << "::"; - } + if (site.mClassInfo != typeid(NoClassInfo)) + { + prefix << className(site.mClassInfo) << "::"; + } #endif - prefix << site.mFunction << ": "; + prefix << site.mFunction << ": "; + } prefix << message; message = prefix.str(); |