summaryrefslogtreecommitdiff
path: root/indra/llmessage/message.h
diff options
context:
space:
mode:
authorsimon <none@none>2015-04-15 15:07:13 -0700
committersimon <none@none>2015-04-15 15:07:13 -0700
commita219cf1c98527faa0e7addeb9660f679208bb0e7 (patch)
tree78a14774f7ff79dd92c022caa2d9d68ec85fba85 /indra/llmessage/message.h
parentb5324afb6f2e45deefb9b79e7e2192bc686b181a (diff)
parenta647b8f1cbab13f07ea889c80df28414bc906129 (diff)
Merge viewer-release
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)