From 08d746156b56d8b72919af8cbca25609c855ef82 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Thu, 3 May 2007 21:48:14 +0000
Subject: Result of svn merge -r59717:60410
svn+ssh://svn/svn/linden/branches/adroit.2007-03-13 into release.
---
indra/llcommon/llstring.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/llcommon')
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index cbfc2a2a75..c8c6e9ce7a 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -1023,7 +1023,7 @@ void LLStringBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_strin
}
else
{
- LLWString tail = dst.substr(offset);
+ std::basic_string<T> tail = dst.substr(offset);
dst = dst.substr(0, offset);
dst += src;
--
cgit v1.2.3