summaryrefslogtreecommitdiff
path: root/indra/llmessage/llxfer_mem.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-21 13:26:15 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-21 13:26:15 -0400
commite766d9e697eae29b3f82106603843efbeb7aa01b (patch)
tree872a0ab94d81699ec3ea1f7113c9c56e2a2486d3 /indra/llmessage/llxfer_mem.h
parentd26c931ae2c5d33adc5fc20842b7be838a2822b4 (diff)
parentdc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff)
DRTVWR-447: Merge up to latest viewer-release
Diffstat (limited to 'indra/llmessage/llxfer_mem.h')
-rw-r--r--indra/llmessage/llxfer_mem.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llmessage/llxfer_mem.h b/indra/llmessage/llxfer_mem.h
index b5adf837df..d07779de87 100644
--- a/indra/llmessage/llxfer_mem.h
+++ b/indra/llmessage/llxfer_mem.h
@@ -53,7 +53,6 @@ class LLXfer_Mem : public LLXfer
virtual void cleanup();
virtual S32 startSend (U64 xfer_id, const LLHost &remote_host);
- virtual U64 registerXfer(U64 xfer_id, const void *datap, const S32 length);
virtual void setXferSize (S32 data_size);
virtual S32 initializeRequest(U64 xfer_id,