diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-13 22:50:12 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-13 22:50:12 -0700 |
| commit | c9c02d1236fde6a3fc647d2002959aad955c014c (patch) | |
| tree | 6cfa8b8df072d71b1c60088e7af4cf87cdeb7585 /indra/llcommon | |
| parent | e41058e92a0ac401206bd979ffc46a5acda17a37 (diff) | |
| parent | 73ba1f288d30777754d13560863e3e4fade2fc6a (diff) | |
merge lenny build improvements.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llstring.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 69e3ff266a..10f460e8a6 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -71,7 +71,7 @@ void LLSDSerialize::serialize(const LLSD& sd, std::ostream& str, ELLSD_Serialize break; default: - llwarns << "serialize request for unkown ELLSD_Serialize" << llendl; + llwarns << "serialize request for unknown ELLSD_Serialize" << llendl; } if (f.notNull()) diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 88fecb57bf..7e41e787b5 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -435,7 +435,7 @@ LL_COMMON_API bool iswindividual(llwchar elem); */ // Make the incoming string a utf8 string. Replaces any unknown glyph -// with the UNKOWN_CHARACTER. Once any unknown glph is found, the rest +// with the UNKNOWN_CHARACTER. Once any unknown glyph is found, the rest // of the data may not be recovered. LL_COMMON_API std::string rawstr_to_utf8(const std::string& raw); |