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/llxml | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llxmlnode.cpp | 3 | ||||
| -rw-r--r-- | indra/llxml/llxmlparser.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index 02c762cbe0..29e7214020 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -21,6 +21,7 @@ #include "v3dmath.h" #include "v4math.h" #include "llquaternion.h" +#include "llstring.h" #include "lluuid.h" const S32 MAX_COLUMN_WIDTH = 80; @@ -3068,6 +3069,8 @@ LLString LLXMLNode::getTextContents() const msg = mValue.substr(start); } } + // Convert any internal CR to LF + msg = utf8str_removeCRLF(msg); } } return msg; diff --git a/indra/llxml/llxmlparser.cpp b/indra/llxml/llxmlparser.cpp index e54b1c400d..459e27e542 100644 --- a/indra/llxml/llxmlparser.cpp +++ b/indra/llxml/llxmlparser.cpp @@ -2,7 +2,7 @@ * @file llxmlparser.cpp * @brief LLXmlParser implementation * - * Copyright (c) 2002-$CurrentYear$`, Linden Research, Inc. + * Copyright (c) 2002-$CurrentYear$, Linden Research, Inc. * $License$ */ |