diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-26 09:12:08 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-26 09:12:08 -0400 |
commit | 3a7513b5875b86c247dd49fe78b8fab955ba5e0a (patch) | |
tree | 3f942d50b41fd090550541af01bb50d23d845c09 /indra/llmessage/llxfer_mem.cpp | |
parent | 06954294b8739dd51abe75e3710da6e496b353d4 (diff) | |
parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) |
DRTVWR-453: Merge up to latest viewer-release.
Diffstat (limited to 'indra/llmessage/llxfer_mem.cpp')
-rw-r--r-- | indra/llmessage/llxfer_mem.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/indra/llmessage/llxfer_mem.cpp b/indra/llmessage/llxfer_mem.cpp index 3bea08f2e5..78a3e4f558 100644 --- a/indra/llmessage/llxfer_mem.cpp +++ b/indra/llmessage/llxfer_mem.cpp @@ -80,28 +80,6 @@ void LLXfer_Mem::setXferSize (S32 xfer_size) /////////////////////////////////////////////////////////// -U64 LLXfer_Mem::registerXfer(U64 xfer_id, const void *datap, const S32 length) -{ - mID = xfer_id; - - if (datap) - { - setXferSize(length); - if (mBuffer) - { - memcpy(mBuffer,datap,length); /* Flawfinder : ignore */ - mBufferLength = length; - } - else - { - xfer_id = 0; - } - } - - mStatus = e_LL_XFER_REGISTERED; - return (xfer_id); -} - S32 LLXfer_Mem::startSend (U64 xfer_id, const LLHost &remote_host) { S32 retval = LL_ERR_NOERR; // presume success |