diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
| commit | 56af97063aaa35c1a70f5edaf47f4a015600860d (patch) | |
| tree | 299b113fab1ff7176c86342aa3e881491cd3b883 /indra/llcommon/lltimer.cpp | |
| parent | b679975d8fdc22d33d0f62288934be8f0209157e (diff) | |
| parent | 681c5de92bd09622de360818682240b0a17403f7 (diff) | |
Pull from vir/drano
Diffstat (limited to 'indra/llcommon/lltimer.cpp')
| -rw-r--r-- | indra/llcommon/lltimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index 38054b636e..9ebc6de7f4 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -83,7 +83,7 @@ U32 micro_sleep(U64 us, U32 max_yields) { // max_yields is unused; just fiddle with it to avoid warnings. max_yields = 0; - ms_sleep(us / 1000); + ms_sleep((U32)(us / 1000)); return 0; } #elif LL_LINUX || LL_SOLARIS || LL_DARWIN |