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/test | |
| 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/test')
| -rw-r--r-- | indra/test/lltemplatemessagebuilder_tut.cpp | 7 | ||||
| -rw-r--r-- | indra/test/message_tut.cpp | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp index 52d1436761..c71d63a2d7 100644 --- a/indra/test/lltemplatemessagebuilder_tut.cpp +++ b/indra/test/lltemplatemessagebuilder_tut.cpp @@ -59,6 +59,9 @@ namespace tut if(! init) { ll_init_apr(); + const F32 circuit_heartbeat_interval=5; + const F32 circuit_timeout=100; + start_messaging_system("notafile", 13035, LL_VERSION_MAJOR, LL_VERSION_MINOR, @@ -66,7 +69,9 @@ namespace tut FALSE, "notasharedsecret", NULL, - false); + false, + circuit_heartbeat_interval, + circuit_timeout); //init_prehash_data(); init = true; } diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp index d426511d24..0cafdcd679 100644 --- a/indra/test/message_tut.cpp +++ b/indra/test/message_tut.cpp @@ -70,6 +70,9 @@ namespace tut //init_prehash_data(); init = true; } + const F32 circuit_heartbeat_interval=5; + const F32 circuit_timeout=100; + // currently test disconnected message system start_messaging_system("notafile", 13035, @@ -79,7 +82,10 @@ namespace tut FALSE, "notasharedsecret", NULL, - false); + false, + circuit_heartbeat_interval, + circuit_timeout + ); // generate temp dir std::ostringstream ostr; #if LL_WINDOWS |