diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:46:51 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:46:51 -0400 |
| commit | d215de3b7d672dcb5da41600c2b5d0abe2cb82ce (patch) | |
| tree | eb12d68e18684eb5dd6f4cb309c039f5bc52ed11 /indra/newview/llsyntaxid.h | |
| parent | 91f636f23a6db27c4ca4c5df2325a7053ca3044e (diff) | |
| parent | 68f42e4e102bd578386aeec3485233e332cbdcff (diff) | |
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/newview/llsyntaxid.h')
| -rw-r--r-- | indra/newview/llsyntaxid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h index 47de94cea2..0afa6dc04b 100644 --- a/indra/newview/llsyntaxid.h +++ b/indra/newview/llsyntaxid.h @@ -57,7 +57,7 @@ private: void loadDefaultKeywordsIntoLLSD(); void loadKeywordsIntoLLSD(); - void fetchKeywordsFileCoro(LLCoros::self& self, std::string url, std::string fileSpec); + void fetchKeywordsFileCoro(std::string url, std::string fileSpec); void cacheFile(const std::string &fileSpec, const LLSD& content_ref); std::string mCapabilityURL; |