summaryrefslogtreecommitdiff
path: root/indra/llcommon/llstring.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-11-14 08:49:08 -0500
committerNat Goodspeed <nat@lindenlab.com>2014-11-14 08:49:08 -0500
commit6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch)
tree86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/llcommon/llstring.cpp
parent2301cf800f40101baed7a5936683d0b1e4968be1 (diff)
parent316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llstring.cpp')
-rwxr-xr-xindra/llcommon/llstring.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 76979f29f6..617969ab2a 100755
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -1397,7 +1397,7 @@ void LLStringUtilBase<T>::testHarness()
s2.erase( 4, 1 );
llassert( s2 == "hell");
- s2.insert( 0, 'y' );
+ s2.insert( 0, "y" );
llassert( s2 == "yhell");
s2.erase( 1, 3 );
llassert( s2 == "yl");