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

Adding getter for mFullFileSpec, shortening loadKeywordsFileIntoLLSD to loadKeywordsIntoLLSD.

master
Ima Mechanique 2013-11-10 17:43:17 +00:00
parent a4c5b5c416
commit da0cd7b845
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llsyntaxid.cpp
View File

@ -248,7 +248,7 @@ void LLSyntaxIdLSL::initialise()
LL_WARNS("LSLSyntax")
<< "Filename is cached, no need to download!"
<< LL_ENDL;
loadKeywordsFileIntoLLSD();
loadKeywordsIntoLLSD();
}
}
else
@ -256,7 +256,7 @@ void LLSyntaxIdLSL::initialise()
LL_WARNS("LSLSyntax")
<< "ID is null so SyntaxID does not need to be processed!"
<< LL_ENDL;
loadKeywordsFileIntoLLSD();
loadKeywordsIntoLLSD();
}
mFileNameCurrent = mFileNameNew;
mSyntaxIdCurrent = mSyntaxIdNew;
@ -278,7 +278,7 @@ void LLSyntaxIdLSL::initialise()
* contained data to the specified LLSD object.
* @return Returns boolean true/false indicating success or failure.
*/
bool LLSyntaxIdLSL::loadKeywordsFileIntoLLSD()
bool LLSyntaxIdLSL::loadKeywordsIntoLLSD()
{
LL_WARNS("LSLSyntax")
<< "Trying to open default or cached keyword file ;-)"

4
indra/newview/llsyntaxid.h
View File

@ -39,6 +39,7 @@ public:
bool checkSyntaxIdChanged();
std::string getFileNameCurrent() const { return mFileNameCurrent; }
ELLPath getFilePath() const { return mFilePath; }
std::string getFileSpec() const { return mFullFileSpec; }
LLSD getKeywordsXML() const { return sKeywordsXml; }
LLUUID getSyntaxId() const { return mSyntaxIdCurrent; }
@ -51,8 +52,7 @@ protected:
std::string buildFileNameNew();
std::string buildFullFileSpec();
void fetchKeywordsFile();
//void openKeywordsFile();
bool loadKeywordsFileIntoLLSD();
bool loadKeywordsIntoLLSD();
void setSyntaxId(LLUUID SyntaxId) { mSyntaxIdCurrent = SyntaxId; }
void setFileNameCurrent(std::string& name) { mFileNameCurrent = name; }
void setFileNameDefault(std::string& name) { mFileNameDefault = name; }