From 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 Mon Sep 17 00:00:00 2001
From: Tess Chu <tess@lindenlab.com>
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/llsdmessagebuilder_tut.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/test/llsdmessagebuilder_tut.cpp')

diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp
index b153292abc..900de1f2dd 100755
--- a/indra/test/llsdmessagebuilder_tut.cpp
+++ b/indra/test/llsdmessagebuilder_tut.cpp
@@ -114,7 +114,7 @@ namespace tut
 	void LLSDMessageBuilderTestObject::test<7>()
 		 // F32
 	{
-	  F32 outValue, inValue = 121.44;
+	  F32 outValue, inValue = 121.44f;
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  builder.addF32("var", inValue);
 	  LLSDMessageReader reader = setReader(builder);
-- 
cgit v1.2.3