From 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 Mon Sep 17 00:00:00 2001 From: Tess Chu Date: Wed, 11 Jul 2007 21:29:02 +0000 Subject: svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw. --- indra/test/llsdmessagereader_tut.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/test/llsdmessagereader_tut.cpp') diff --git a/indra/test/llsdmessagereader_tut.cpp b/indra/test/llsdmessagereader_tut.cpp index 31810ae00e..60a4ea0f29 100755 --- a/indra/test/llsdmessagereader_tut.cpp +++ b/indra/test/llsdmessagereader_tut.cpp @@ -10,6 +10,7 @@ #include #include "lltut.h" +#include "message.h" #include "llsdmessagereader.h" #include "llsdutil.h" @@ -21,7 +22,7 @@ namespace tut const std::string& expected_name) { LLSDMessageReader msg; - msg.setMessage(msg_name, msg_data); + msg.setMessage(gMessageStringTable.getString(msg_name.c_str()), msg_data); ensure_equals("Ensure name", std::string(msg.getMessageName()), expected_name); } @@ -169,7 +170,7 @@ namespace tut void LLSDMessageReaderTestObject::test<9>() // F32 { - F32 outValue, inValue = 121.44; + F32 outValue, inValue = 121.44f; LLSDMessageReader msg = testType(inValue); msg.getF32("block", "var", outValue); ensure_equals("Ensure F32", outValue, inValue); @@ -297,4 +298,3 @@ namespace tut ensure_equals("Ensure Binary", outValue, inValue); } } - -- cgit v1.2.3