summaryrefslogtreecommitdiff
path: root/indra/test/llsdmessagereader_tut.cpp
diff options
context:
space:
mode:
authorTess Chu <tess@lindenlab.com>2007-07-11 21:29:02 +0000
committerTess Chu <tess@lindenlab.com>2007-07-11 21:29:02 +0000
commit57b8fef824b6d7f37c5be5812ebffa39ab2e8093 (patch)
treef89014544fc276b283a36eb2e0cb52e93806a44a /indra/test/llsdmessagereader_tut.cpp
parenta6769f262ff910949a7e1c81cf98e52ddfc2d44a (diff)
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.
Diffstat (limited to 'indra/test/llsdmessagereader_tut.cpp')
-rwxr-xr-xindra/test/llsdmessagereader_tut.cpp6
1 files changed, 3 insertions, 3 deletions
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 <tut/tut.h>
#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);
}
}
-