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

Removing duplication of messages

meow-7.2.2
Ima Mechanique 2014-01-30 14:03:34 +00:00
parent 4bcb67c704
commit 93322ff176
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llsyntaxid.cpp
View File

@ -248,12 +248,12 @@ void LLSyntaxIdLSL::initialise()
LL_INFOS("SyntaxLSL")
<< "File is cached, no need to download!"
<< LL_ENDL;
loadKeywordsIntoLLSD();
sLoaded = loadKeywordsIntoLLSD();
}
}
else
{ // Need to open the default
loadDefaultKeywordsIntoLLSD("LSLSyntaxId is null so we will use the default file!");
loadDefaultKeywordsIntoLLSD();
}
}
else if (sKeywordsXml.isDefined())
@ -264,7 +264,7 @@ void LLSyntaxIdLSL::initialise()
}
else
{ // Need to open the default
loadDefaultKeywordsIntoLLSD("LSLSyntaxId is null so we will use the default file!");
loadDefaultKeywordsIntoLLSD();
}
mFileNameCurrent = mFileNameNew;
@ -305,12 +305,13 @@ bool LLSyntaxIdLSL::isSupportedVersion(const LLSD& content)
//-----------------------------------------------------------------------------
// loadDefaultKeywordsIntoLLSD()
//-----------------------------------------------------------------------------
void LLSyntaxIdLSL::loadDefaultKeywordsIntoLLSD(const std::string message)
void LLSyntaxIdLSL::loadDefaultKeywordsIntoLLSD()
{
LL_INFOS("SyntaxLSL") << message << LL_ENDL;
LL_INFOS("SyntaxLSL")
<< "LSLSyntaxId is null so we will use the default file!" << LL_ENDL;
mSyntaxIdNew = LLUUID();
buildFullFileSpec();
loadKeywordsIntoLLSD();
sLoaded = loadKeywordsIntoLLSD();
}
//-----------------------------------------------------------------------------

2
indra/newview/llsyntaxid.h
View File

@ -89,7 +89,7 @@ protected:
std::string buildFileNameNew();
std::string buildFullFileSpec();
void fetchKeywordsFile();
void loadDefaultKeywordsIntoLLSD(const std::string message);
void loadDefaultKeywordsIntoLLSD();
bool loadKeywordsIntoLLSD();
void setSyntaxId(LLUUID SyntaxId) { mSyntaxIdCurrent = SyntaxId; }
void setFileNameCurrent(std::string& name) { mFileNameCurrent = name; }