diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2016-10-17 15:27:38 +0000 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2016-10-17 15:27:38 +0000 |
commit | c86967100c453ed35aca0ebbe57dd9dc9b85288f (patch) | |
tree | a1d7ae7aa06cd2506640da833d8cd023ecbfd7fd /indra/llmessage/llxfermanager.h | |
parent | 2540868bf38b39da4c94714f507941386e72da7c (diff) | |
parent | b98bc258f23c3497a5c0605d1be56d44a058be88 (diff) |
Merged in MAINT-6487
Diffstat (limited to 'indra/llmessage/llxfermanager.h')
-rw-r--r-- | indra/llmessage/llxfermanager.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/llxfermanager.h b/indra/llmessage/llxfermanager.h index b3d110e7a1..d258f0a5ce 100644 --- a/indra/llmessage/llxfermanager.h +++ b/indra/llmessage/llxfermanager.h @@ -140,7 +140,7 @@ class LLXferManager // file requesting routines // .. to file - virtual void requestFile(const std::string& local_filename, + virtual U64 requestFile(const std::string& local_filename, const std::string& remote_filename, ELLPath remote_path, const LLHost& remote_host, @@ -202,6 +202,7 @@ class LLXferManager virtual void retransmitUnackedPackets (); // error handling + void abortRequestById(U64 xfer_id, S32 result_code); virtual void processAbort (LLMessageSystem *mesgsys, void **user_data); }; |