diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/test | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/llmessagetemplateparser_tut.cpp | 2 | ||||
| -rwxr-xr-x | indra/test/llsdmessagereader_tut.cpp | 2 | ||||
| -rw-r--r-- | indra/test/lltemplatemessagebuilder_tut.cpp | 2 | ||||
| -rw-r--r-- | indra/test/message_tut.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/test/llmessagetemplateparser_tut.cpp b/indra/test/llmessagetemplateparser_tut.cpp index e9988be68f..e2680e315f 100644 --- a/indra/test/llmessagetemplateparser_tut.cpp +++ b/indra/test/llmessagetemplateparser_tut.cpp @@ -56,7 +56,7 @@ namespace tut char * prehash(const char * name) { - return gMessageStringTable.getString(name); + return LLMessageStringTable::getInstance()->getString(name); } void ensure_block_attributes(std::string identifier, diff --git a/indra/test/llsdmessagereader_tut.cpp b/indra/test/llsdmessagereader_tut.cpp index 646b875324..67287d55e2 100755 --- a/indra/test/llsdmessagereader_tut.cpp +++ b/indra/test/llsdmessagereader_tut.cpp @@ -46,7 +46,7 @@ namespace tut const std::string& expected_name) { LLSDMessageReader msg; - msg.setMessage(gMessageStringTable.getString(msg_name.c_str()), msg_data); + msg.setMessage(LLMessageStringTable::getInstance()->getString(msg_name.c_str()), msg_data); ensure_equals("Ensure name", std::string(msg.getMessageName()), expected_name); } diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp index 31e9c718ab..a9d515dfdc 100644 --- a/indra/test/lltemplatemessagebuilder_tut.cpp +++ b/indra/test/lltemplatemessagebuilder_tut.cpp @@ -65,7 +65,7 @@ namespace tut LL_VERSION_PATCH, FALSE, "notasharedsecret"); - init_prehash_data(); + //init_prehash_data(); init = true; } return LLMessageTemplate(_PREHASH_TestMessage, 1, MFT_HIGH); diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp index 5d9f6ee65e..ca0452a9f3 100644 --- a/indra/test/message_tut.cpp +++ b/indra/test/message_tut.cpp @@ -62,7 +62,7 @@ namespace tut if(! init) { ll_init_apr(); - init_prehash_data(); + //init_prehash_data(); init = true; } |