diff options
| author | Jacek Antonelli | 2009-09-09 12:27:11 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-10 02:26:28 -0500 |
| commit | e944c5086e47e92e7952e5a43c68f01108899656 (patch) | |
| tree | c47ff63c4dcae473cd07a0dbcbc9d52636e6061e /linden/indra/llcommon/llstring.h | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | looks like working now (diff) | |
| download | meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.zip meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.gz meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.bz2 meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.xz | |
Merged 'armin/grid-manager5' into login-manager
Conflicts:
linden/indra/newview/CMakeLists.txt
linden/indra/newview/llpanellogin.cpp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llcommon/llstring.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h index 720b163..93bd89a 100644 --- a/linden/indra/llcommon/llstring.h +++ b/linden/indra/llcommon/llstring.h | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <wctype.h> | 36 | #include <wctype.h> |
| 37 | #include <wchar.h> | 37 | #include <wchar.h> |
| 38 | #endif | 38 | #endif |
| 39 | #include "linden_common.h" | ||
| 39 | 40 | ||
| 40 | const char LL_UNKNOWN_CHAR = '?'; | 41 | const char LL_UNKNOWN_CHAR = '?'; |
| 41 | 42 | ||