diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
| commit | cf09a48bb21d553c837186cc2e7198801f06691a (patch) | |
| tree | a668e28da71f9fafe6333784400dc8f24671fad6 /indra/llcommon/lllivefile.cpp | |
| parent | 1c1ebd0365a115c736f62fadec37e006cbf43f44 (diff) | |
| parent | 8fdb199707979916d4d3c23cd19fec9fed411aba (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
Diffstat (limited to 'indra/llcommon/lllivefile.cpp')
| -rw-r--r-- | indra/llcommon/lllivefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lllivefile.cpp b/indra/llcommon/lllivefile.cpp index effda6c49c..5ca90d82ba 100644 --- a/indra/llcommon/lllivefile.cpp +++ b/indra/llcommon/lllivefile.cpp @@ -33,7 +33,7 @@ #include "lllivefile.h" #include "llframetimer.h" -#include "lltimer.h" +#include "lleventtimer.h" const F32 DEFAULT_CONFIG_FILE_REFRESH = 5.0f; |