diff options
| author | Richard Linden <none@none> | 2013-07-31 10:41:38 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-31 10:41:38 -0700 |
| commit | ff0764b25017ab6a56e1000386b6abf7087d103c (patch) | |
| tree | 22d5a6cde3663dea7dce2b4bbbd0d1190150b0ee | |
| parent | c5651d05fd57b01703999cd3885fb45c69143419 (diff) | |
| parent | e740fcc959572a6faa2350a1e73cbddcef4cf30b (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
| -rwxr-xr-x | indra/test/lltemplatemessagebuilder_tut.cpp | 7 | ||||
| -rwxr-xr-x | indra/test/message_tut.cpp | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp index 6c0b70edd2..381826658b 100755 --- a/indra/test/lltemplatemessagebuilder_tut.cpp +++ b/indra/test/lltemplatemessagebuilder_tut.cpp @@ -35,7 +35,6 @@ #include "llquaternion.h" #include "lltemplatemessagebuilder.h" #include "lltemplatemessagereader.h" -#include "llversionserver.h" #include "message_prehash.h" #include "u64.h" #include "v3dmath.h" @@ -59,9 +58,9 @@ namespace tut const F32 circuit_timeout=100; start_messaging_system("notafile", 13035, - LL_VERSION_MAJOR, - LL_VERSION_MINOR, - LL_VERSION_PATCH, + 1, + 0, + 0, FALSE, "notasharedsecret", NULL, diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp index d971b33475..4c0463c65c 100755 --- a/indra/test/message_tut.cpp +++ b/indra/test/message_tut.cpp @@ -32,7 +32,6 @@ #include "llapr.h" #include "llmessageconfig.h" #include "llsdserialize.h" -#include "llversionserver.h" #include "message.h" #include "message_prehash.h" @@ -72,9 +71,9 @@ namespace tut // currently test disconnected message system start_messaging_system("notafile", 13035, - LL_VERSION_MAJOR, - LL_VERSION_MINOR, - LL_VERSION_PATCH, + 1, + 0, + 0, FALSE, "notasharedsecret", NULL, |