livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7593 FIXED "Failed to parse parameter" spam

master
Mnikolenko Productengine 2017-07-13 11:01:20 +03:00
parent 4ac4289724
commit ab26a70047
8 changed files with 15 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llcommon/llinitparam.cpp
View File

@ -193,12 +193,7 @@ namespace LLInitParam
{
if (!silent)
{
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()));
p.parserWarning(llformat("Failed to parse parameter \"%s\"", p.getCurrentElementName().c_str()));
}
return false;
}

36
indra/llui/llxuiparser.cpp
View File

@ -58,10 +58,6 @@ static LLInitParam::Parser::parser_inspect_func_map_t sSimpleXUIInspectFuncs;
const char* NO_VALUE_MARKER = "no_value";
#ifdef LL_WINDOWS
const S32 LINE_NUMBER_HERE = 0;
#endif
struct MaxOccursValues : public LLInitParam::TypeValuesHelper<U32, MaxOccursValues>
{
static void declareValues()
@ -1313,22 +1309,14 @@ bool LLXUIParser::writeSDValue(Parser& parser, const void* val_ptr, name_stack_t
void LLXUIParser::parserWarning(const std::string& message)
{
#ifdef LL_WINDOWS
// use Visual Studio friendly formatting of output message for easy access to originating xml
LL_INFOS() << llformat("%s(%d):\t%s", mCurFileName.c_str(), mCurReadNode->getLineNumber(), message.c_str()) << LL_ENDL;
#else
Parser::parserWarning(message);
#endif
std::string warning_msg = llformat("%s:\t%s(%d)", message.c_str(), mCurFileName.c_str(), mCurReadNode->getLineNumber());
Parser::parserWarning(warning_msg);
}
void LLXUIParser::parserError(const std::string& message)
{
#ifdef LL_WINDOWS
// use Visual Studio friendly formatting of output message for easy access to originating xml
LL_INFOS() << llformat("%s(%d):\t%s", mCurFileName.c_str(), mCurReadNode->getLineNumber(), message.c_str()) << LL_ENDL;
#else
Parser::parserError(message);
#endif
std::string error_msg = llformat("%s:\t%s(%d)", message.c_str(), mCurFileName.c_str(), mCurReadNode->getLineNumber());
Parser::parserError(error_msg);
}
@ -1641,22 +1629,14 @@ bool LLSimpleXUIParser::processText()
void LLSimpleXUIParser::parserWarning(const std::string& message)
{
#ifdef LL_WINDOWS
// use Visual Studio friendly formatting of output message for easy access to originating xml
LL_INFOS() << llformat("%s(%d):\t%s", mCurFileName.c_str(), LINE_NUMBER_HERE, message.c_str()) << LL_ENDL;
#else
Parser::parserWarning(message);
#endif
std::string warning_msg = llformat("%s:\t%s", message.c_str(), mCurFileName.c_str());
Parser::parserWarning(warning_msg);
}
void LLSimpleXUIParser::parserError(const std::string& message)
{
#ifdef LL_WINDOWS
// use Visual Studio friendly formatting of output message for easy access to originating xml
LL_INFOS() << llformat("%s(%d):\t%s", mCurFileName.c_str(), LINE_NUMBER_HERE, message.c_str()) << LL_ENDL;
#else
Parser::parserError(message);
#endif
std::string error_msg = llformat("%s:\t%s", message.c_str(), mCurFileName.c_str());
Parser::parserError(error_msg);
}
bool LLSimpleXUIParser::readFlag(Parser& parser, void* val_ptr)

1
indra/newview/skins/default/xui/en/floater_grid_status.xml
View File

@ -12,7 +12,6 @@
save_rect="true"
save_visibility="true"
title=""
initial_mime_type="text/html"
width="780"
tab_stop="true"
filename="floater_web_content.xml"/>

1
indra/newview/skins/default/xui/en/floater_web_content.xml
View File

@ -10,7 +10,6 @@
help_topic="floater_web_content"
save_rect="true"
title=""
initial_mime_type="text/html"
width="780">
<layout_stack
bottom="775"

20
indra/newview/skins/default/xui/en/panel_active_object_row.xml
View File

@ -18,15 +18,7 @@
left="5"
height="25"
width="25"
visible="false"
speaker.name="speaker_p2p"
speaker.width="20"
speaker.height="25"
speaker.left="25"
speaker.top="25"
speaker.auto_update="true"
speaker.draw_border="false"
speaker.visible="false">
visible="false">
</chiclet_script>
<chiclet_offer
name="inv_offer_chiclet"
@ -36,15 +28,7 @@
left="5"
height="25"
width="25"
visible="false"
speaker.name="speaker_p2p"
speaker.width="20"
speaker.height="25"
speaker.left="25"
speaker.top="25"
speaker.auto_update="true"
speaker.draw_border="false"
speaker.visible="false">
visible="false">
</chiclet_offer>
<text
type="string"

4
indra/newview/skins/default/xui/en/panel_media_settings_general.xml
View File

@ -193,7 +193,7 @@
follows="left|top"
height="16"
increment="1"
initial_val="256"
initial_value="256"
label=""
label_width="0"
left_delta="68"
@ -213,7 +213,7 @@
follows="left|top"
height="16"
increment="1"
initial_val="256"
initial_value="256"
label=""
label_width="0"
left_delta="20"

2
indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
View File

@ -87,7 +87,7 @@
height="23"
layout="topleft"
left="80"
max_length="4096"
max_length_bytes="4096"
name="cache_location"
top_pad="5"
width="205" />

3
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
has_border="true"
height="408"
label="Text Chat"
layout="topleft"
@ -541,7 +540,7 @@
height="23"
layout="topleft"
left_pad="55"
max_length="4096"
max_length_bytes="4096"
name="log_path_string"
top_delta="-5"
width="185">