summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llsyntaxid.cpp6
-rw-r--r--indra/newview/llsyntaxid.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 2388f1c5ef..18869c215d 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -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 ;-)"
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index 50013a8380..fc875a835f 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -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; }