summaryrefslogtreecommitdiff
path: root/indra/newview/llsyntaxid.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llsyntaxid.cpp')
-rw-r--r--indra/newview/llsyntaxid.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 7551c1a442..0ef5993ac1 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -37,9 +37,9 @@
//-----------------------------------------------------------------------------
// fetchKeywordsFileResponder
//-----------------------------------------------------------------------------
-fetchKeywordsFileResponder::fetchKeywordsFileResponder(std::string filespec)
+fetchKeywordsFileResponder::fetchKeywordsFileResponder(const std::string& filespec)
+: mFileSpec(filespec)
{
- mFileSpec = filespec;
LL_DEBUGS("SyntaxLSL") << "Instantiating with file saving to: '" << filespec << "'" << LL_ENDL;
}
@@ -128,18 +128,11 @@ LLSyntaxIdLSL::LLSyntaxIdLSL() :
{
}
-std::string LLSyntaxIdLSL::buildFileNameNew()
-{
- mFileNameNew = mSyntaxIdNew.isNull() ? mFileNameDefault : "keywords_lsl_" + mSyntaxIdNew.asString() + ".llsd.xml";
- return mFileNameNew;
-}
-
-std::string LLSyntaxIdLSL::buildFullFileSpec()
+void LLSyntaxIdLSL::buildFullFileSpec()
{
ELLPath path = mSyntaxIdNew.isNull() ? LL_PATH_APP_SETTINGS : LL_PATH_CACHE;
- buildFileNameNew();
+ mFileNameNew = mSyntaxIdNew.isNull() ? mFileNameDefault : "keywords_lsl_" + mSyntaxIdNew.asString() + ".llsd.xml";
mFullFileSpec = gDirUtilp->getExpandedFilename(path, mFileNameNew);
- return mFullFileSpec;
}
//-----------------------------------------------------------------------------