diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-05-03 21:48:14 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-05-03 21:48:14 +0000 |
| commit | 08d746156b56d8b72919af8cbca25609c855ef82 (patch) | |
| tree | 51d4c6d06b87b5477e3c61d42ee49de19a2d72b6 /indra/llcommon | |
| parent | 5de49ccb321aba6f09111e74abbb965b630f8d27 (diff) | |
Result of svn merge -r59717:60410 svn+ssh://svn/svn/linden/branches/adroit.2007-03-13 into release.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |