diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
| commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
| tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/newview/llmediadataclient.h | |
| parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
| parent | 465a3356a2f32362837d5231a21b9151f45f890b (diff) | |
Merge
Diffstat (limited to 'indra/newview/llmediadataclient.h')
| -rwxr-xr-x | indra/newview/llmediadataclient.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h index 75d32e707b..8dd72cb595 100755 --- a/indra/newview/llmediadataclient.h +++ b/indra/newview/llmediadataclient.h @@ -37,7 +37,7 @@ #include <queue> #include "llrefcount.h" #include "llpointer.h" -#include "lltimer.h" +#include "lleventtimer.h" // Link seam for LLVOVolume |