diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsyntaxid.cpp | 15 | ||||
| -rw-r--r-- | indra/newview/llsyntaxid.h | 5 |
2 files changed, 6 insertions, 14 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; } //----------------------------------------------------------------------------- diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h index f14693d619..2288fb4ab8 100644 --- a/indra/newview/llsyntaxid.h +++ b/indra/newview/llsyntaxid.h @@ -62,8 +62,7 @@ public: boost::signals2::connection addFileFetchedCallback(const file_fetched_signal_t::slot_type& cb); protected: - std::string buildFileNameNew(); - std::string buildFullFileSpec(); + void buildFullFileSpec(); void fetchKeywordsFile(); void loadDefaultKeywordsIntoLLSD(); void loadKeywordsIntoLLSD(); @@ -105,7 +104,7 @@ public: * @brief fetchKeywordsFileResponder * @param filespec File path and name of where to save the returned data */ - fetchKeywordsFileResponder(std::string filespec); + fetchKeywordsFileResponder(const std::string& filespec); void errorWithContent(U32 status, const std::string& reason, |