llmessage merge and further LLUnit usage.

2016-04-07 20:17:30 -05:00
parent 8c946dc706
commit 691a5395ca
43 changed files with 514 additions and 465 deletions
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1968,7 +1968,7 @@ bool idle_startup()
 			gFirstSim,
 			MAX_TIMEOUT_COUNT,
 			FALSE,
-			TIMEOUT_SECONDS,
+			F32Seconds(TIMEOUT_SECONDS),
 			use_circuit_callback,
 			NULL);