diff options
| author | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
| commit | 38558960978a0741dd9c79c4c7a108b8a1f99eff (patch) | |
| tree | b7221183a7c91c1097a78cf5875197431852b0b8 /indra/llcommon/llerror.cpp | |
| parent | e77de5d685ae441f72920f0e04d9887ee958745a (diff) | |
EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
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 e635011941..95038bea4c 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -1040,18 +1040,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 << ": "; if (site.mPrintOnce) { |