2 files changed, 9 insertions, 6 deletions

diff --git a/linden/indra/test/llapp_tut.cpp b/linden/indra/test/llapp_tut.cpp
index fc069f8..6efced4 100644
--- a/linden/indra/test/llapp_tut.cpp
+++ b/linden/indra/test/llapp_tut.cpp
@@ -69,7 +69,7 @@ namespace tut
                 LLSD defaults;
                 defaults["template"] = "../../../scripts/messages/message_template.msg";
                 defaults["configdir"] = ".";
-                defaults["db_host"] = "mysql.durga.lindenlab.com";
+                defaults["db_host"] = "mysql.mitra.lindenlab.com";
                 defaults["db_user"] = "linden";
                 defaults["db_password"] = "gomez";
                 defaults["datadir"] = "data";
diff --git a/linden/indra/test/llstring_tut.cpp b/linden/indra/test/llstring_tut.cpp
index 191b804..ba6ac7c 100644
--- a/linden/indra/test/llstring_tut.cpp
+++ b/linden/indra/test/llstring_tut.cpp
@@ -564,18 +564,21 @@ namespace tut
                 for (LLStringUtil::format_map_t::const_iterator iter = fmt_map.begin(); iter != fmt_map.end(); ++iter)
                 {
                         // Test when source string is entirely one key
-                        s = iter->first;
-                        subcount = LLStringUtil::format(s, fmt_map);
-                        ensure_equals("LLStringUtil::format: Raw interpolation result", s, iter->second);
+                        std::string s1 = (std::string)iter->first;
+                        std::string s2 = (std::string)iter->second;
+                        subcount = LLStringUtil::format(s1, fmt_map);
+                        ensure_equals("LLStringUtil::format: Raw interpolation result", s1, s2);
                         ensure_equals("LLStringUtil::format: Raw interpolation result count", 1, subcount);
                 }
 
                 for (LLStringUtil::format_map_t::const_iterator iter = fmt_map.begin(); iter != fmt_map.end(); ++iter)
                 {
                         // Test when source string is one key, duplicated
-                        s = iter->first + iter->first + iter->first + iter->first;
+                        std::string s1 = (std::string)iter->first;
+                        std::string s2 = (std::string)iter->second;
+                        s = s1 + s1 + s1 + s1;
                         subcount = LLStringUtil::format(s, fmt_map);
-                        ensure_equals("LLStringUtil::format: Rawx4 interpolation result", s, iter->second + iter->second + iter->second + iter->second);
+                        ensure_equals("LLStringUtil::format: Rawx4 interpolation result", s, s2 + s2 + s2 + s2);
                         ensure_equals("LLStringUtil::format: Rawx4 interpolation result count", 4, subcount);
                 }