diff options
| author | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
| commit | 189599b6ff0c4e6b81e761fbc990c057189359f2 (patch) | |
| tree | 1e9e0e91bae9bb1ee53e57ac91cdbbfc9f6dba95 /indra/llmessage/message.h | |
| parent | fd46865a502036b9e4414e7ec4950faf551b1f14 (diff) | |
Merging from server/server-1.25 back to trunk.
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
Diffstat (limited to 'indra/llmessage/message.h')
| -rw-r--r-- | indra/llmessage/message.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h index 46fa3251de..2f10b149c6 100644 --- a/indra/llmessage/message.h +++ b/indra/llmessage/message.h @@ -285,7 +285,8 @@ public: // Read file and build message templates LLMessageSystem(const std::string& filename, U32 port, S32 version_major, S32 version_minor, S32 version_patch, - bool failure_is_fatal = true); + bool failure_is_fatal, + const F32 circuit_heartbeat_interval, const F32 circuit_timeout); ~LLMessageSystem(); @@ -780,8 +781,10 @@ bool start_messaging_system( S32 version_patch, bool b_dump_prehash_file, const std::string& secret, - const LLUseCircuitCodeResponder* responder = NULL, - bool failure_is_fatal = true); + const LLUseCircuitCodeResponder* responder, + bool failure_is_fatal, + const F32 circuit_heartbeat_interval, + const F32 circuit_timeout); void end_messaging_system(); |