diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 12:27:33 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 12:27:33 +0000 |
| commit | 7660c19ce8fed013eea06450fe6deb4ae92f3ead (patch) | |
| tree | a6b454d6b93a1b8befc1467a4f3570f5fa89a1af /indra/llcommon/llapp.cpp | |
| parent | 62f0f426532808755f6d97f34fd2d8c9e5d2fa6a (diff) | |
| parent | 4e28c10971dc4f9a52a7b3f109143dbce3528d21 (diff) | |
Merge from viewer2 trunk.
Diffstat (limited to 'indra/llcommon/llapp.cpp')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 968b92d1e7..6b2d1b7c20 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -41,7 +41,7 @@ #include "lllivefile.h" #include "llmemory.h" #include "llstl.h" // for DeletePointer() -#include "lltimer.h" +#include "lleventtimer.h" // // Signal handling |