summaryrefslogtreecommitdiff
path: root/indra/llui/llxuiparser.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-03 18:11:08 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-03 18:11:08 -0700
commit62d3a010d430fadf99268498bee3cff3e16c608f (patch)
tree9bf2b47b8441c6db614e56624cca33a2ef27f019 /indra/llui/llxuiparser.cpp
parentd7e76ed642a86e97ae71b96d65fdacb3692b6704 (diff)
BUG-2707 disable sites calling OsOutputDebugString directly to identify which is tossing our errant exception
Diffstat (limited to 'indra/llui/llxuiparser.cpp')
-rwxr-xr-xindra/llui/llxuiparser.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp
index 3ad5ad7d42..2f0e50fdaf 100755
--- a/indra/llui/llxuiparser.cpp
+++ b/indra/llui/llxuiparser.cpp
@@ -1308,7 +1308,7 @@ bool LLXUIParser::writeSDValue(Parser& parser, const void* val_ptr, name_stack_t
void LLXUIParser::parserWarning(const std::string& message)
{
-#ifdef LL_WINDOWS
+#ifdef LL_WINDOWS && BUG_2707_HUNT
// use Visual Studo friendly formatting of output message for easy access to originating xml
llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", mCurFileName.c_str(), mCurReadNode->getLineNumber(), message.c_str()).c_str());
utf16str += '\n';
@@ -1320,7 +1320,7 @@ void LLXUIParser::parserWarning(const std::string& message)
void LLXUIParser::parserError(const std::string& message)
{
-#ifdef LL_WINDOWS
+#ifdef LL_WINDOWS && BUG_2707_HUNT
llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", mCurFileName.c_str(), mCurReadNode->getLineNumber(), message.c_str()).c_str());
utf16str += '\n';
OutputDebugString(utf16str.c_str());
@@ -1639,7 +1639,7 @@ bool LLSimpleXUIParser::processText()
void LLSimpleXUIParser::parserWarning(const std::string& message)
{
-#ifdef LL_WINDOWS
+#ifdef LL_WINDOWS && BUG_2707_HUNT
// use Visual Studo friendly formatting of output message for easy access to originating xml
llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", mCurFileName.c_str(), LINE_NUMBER_HERE, message.c_str()).c_str());
utf16str += '\n';
@@ -1651,7 +1651,7 @@ void LLSimpleXUIParser::parserWarning(const std::string& message)
void LLSimpleXUIParser::parserError(const std::string& message)
{
-#ifdef LL_WINDOWS
+#ifdef LL_WINDOWS && BUG_2707_HUNT
llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", mCurFileName.c_str(), LINE_NUMBER_HERE, message.c_str()).c_str());
utf16str += '\n';
OutputDebugString(utf16str.c_str());