summaryrefslogtreecommitdiff
path: root/indra/llmessage/message.h
diff options
context:
space:
mode:
authorRider Linden <none@none>2015-04-15 11:54:18 -0700
committerRider Linden <none@none>2015-04-15 11:54:18 -0700
commit109e2db131514de43a2d61da1cc4ee78dc89f858 (patch)
tree217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/llmessage/message.h
parent176d8cd268611e28c07a462df3027f4872456e5a (diff)
parent82ae214f6a367e17dd335e80e2444cf672108821 (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)