diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:04:37 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:04:37 +0000 |
commit | 9fdd1582774a928242b7fec91bbd951b123296e8 (patch) | |
tree | 600cd078a00e80a33504c748540e333a34a4b30d /indra/newview/llcompilequeue.h | |
parent | 31bca613a6011f5e1a95cffafd283e445142557f (diff) | |
parent | 363bc9d9d0fe4f42b0dfbdb7adeb9a481a4fe55b (diff) |
Merged in DV525-merge-6.4.15 (pull request #483)
DRTVWR-525 merge up to 6.4.15
Diffstat (limited to 'indra/newview/llcompilequeue.h')
-rw-r--r-- | indra/newview/llcompilequeue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcompilequeue.h b/indra/newview/llcompilequeue.h index adb854875a..a9bac345b5 100644 --- a/indra/newview/llcompilequeue.h +++ b/indra/newview/llcompilequeue.h @@ -135,7 +135,7 @@ protected: //bool checkAssetId(const LLUUID &assetId); static void handleHTTPResponse(std::string pumpName, const LLSD &expresult); - static void handleScriptRetrieval(LLVFS *vfs, const LLUUID& assetId, LLAssetType::EType type, void* userData, S32 status, LLExtStat extStatus); + static void handleScriptRetrieval(const LLUUID& assetId, LLAssetType::EType type, void* userData, S32 status, LLExtStat extStatus); private: static void processExperienceIdResults(LLSD result, LLUUID parent); |