diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
| commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
| tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/llcommon/llstring.h | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index c8c6e9ce7a..3c798b25aa 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -437,6 +437,9 @@ std::string utf8str_makeASCII(const std::string& utf8str); // Hack - used for evil notecards. std::string mbcsstring_makeASCII(const std::string& str); +std::string utf8str_removeCRLF(const std::string& utf8str); + + template <class T> std::ostream& operator<<(std::ostream &s, const LLStringBase<T> &str) { |