diff options
| author | David Walter Seikel | 2013-09-01 03:20:28 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-09-01 03:20:28 +1000 |
| commit | 2eb0e429d8c8dcc095aff7e703a9a3249c345628 (patch) | |
| tree | 405c34a2f594c5d940b290579166b9e95349e418 /linden/indra/llcommon/llstring.h | |
| parent | Merge remote-tracking branch 'imprudence/next' into next (diff) | |
| download | meta-impy-2eb0e429d8c8dcc095aff7e703a9a3249c345628.zip meta-impy-2eb0e429d8c8dcc095aff7e703a9a3249c345628.tar.gz meta-impy-2eb0e429d8c8dcc095aff7e703a9a3249c345628.tar.bz2 meta-impy-2eb0e429d8c8dcc095aff7e703a9a3249c345628.tar.xz | |
Merge post fixes so that Linux compiles.
Windows is being a pig, will take a while.
Diffstat (limited to 'linden/indra/llcommon/llstring.h')
| -rw-r--r-- | linden/indra/llcommon/llstring.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h index ced9713..e1b5cbd 100644 --- a/linden/indra/llcommon/llstring.h +++ b/linden/indra/llcommon/llstring.h | |||
| @@ -458,6 +458,8 @@ LL_COMMON_API std::string mbcsstring_makeASCII(const std::string& str); | |||
| 458 | 458 | ||
| 459 | LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str); | 459 | LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str); |
| 460 | 460 | ||
| 461 | LL_COMMON_API bool is_hex_string(U8* str, S32 len); | ||
| 462 | |||
| 461 | 463 | ||
| 462 | #if LL_WINDOWS | 464 | #if LL_WINDOWS |
| 463 | /* @name Windows string helpers | 465 | /* @name Windows string helpers |