diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 17:17:42 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 17:17:42 +0000 |
| commit | e1e1212daae33723e7da325f295a5c3a6bb78979 (patch) | |
| tree | 95139904e71995519db2fc6e056940b2f40e73a3 /indra/llcommon/llerror.cpp | |
| parent | 41927004751731d2d0cb74989ded36878292ee4e (diff) | |
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
Diffstat (limited to 'indra/llcommon/llerror.cpp')
| -rw-r--r-- | indra/llcommon/llerror.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 13bf368334..057b1bb417 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -1006,18 +1006,15 @@ 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) << "::"; - } - #endif - prefix << site.mFunction << ": "; + if (site.mClassInfo != typeid(NoClassInfo)) + { + prefix << className(site.mClassInfo) << "::"; } + #endif + prefix << site.mFunction << ": "; prefix << message; message = prefix.str(); |