summaryrefslogtreecommitdiff
path: root/indra/llmessage/message.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-13 17:20:36 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-13 17:20:36 -0400
commitd516a8729e413e3097c468e8f3c2c39ff73181bd (patch)
tree3ba17c58af42f23e77199516be4674245328cd86 /indra/llmessage/message.h
parent3f001b520c42d9182de89c3cacb79f6684dd0471 (diff)
parenta647b8f1cbab13f07ea889c80df28414bc906129 (diff)
merge
Diffstat (limited to 'indra/llmessage/message.h')
-rwxr-xr-xindra/llmessage/message.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index da06b64506..348b09b992 100755
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -331,7 +331,7 @@ public:
BOOL poll(F32 seconds); // Number of seconds that we want to block waiting for data, returns if data was received
BOOL checkMessages( S64 frame_count = 0 );
- void processAcks();
+ void processAcks(F32 collect_time = 0.f);
BOOL isMessageFast(const char *msg);
BOOL isMessage(const char *msg)