diff options
| author | Richard Linden <none@none> | 2013-06-05 19:05:43 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-05 19:05:43 -0700 |
| commit | 0a96b47663c99914c587cdcb8bcdc096bbf55fa3 (patch) | |
| tree | 67bca4958927ed7f6df423de05e42cd271292391 /indra/llcommon/llstring.cpp | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
| parent | a74b5dfa923f8eeccc9b786143f0f832de3ad450 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/llcommon/llstring.cpp')
| -rwxr-xr-x | indra/llcommon/llstring.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index 22c8681983..66c416bfdd 100755 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -28,11 +28,10 @@ #include "llstring.h" #include "llerror.h" +#include "llfasttimer.h" #if LL_WINDOWS -#define WIN32_LEAN_AND_MEAN -#include <winsock2.h> -#include <windows.h> +#include "llwin32headerslean.h" #include <winnls.h> // for WideCharToMultiByte #endif |