diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-08 09:50:04 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-08 09:50:04 -0500 |
| commit | 5dda2516ad599d3c295930fb3fc0c6cdbe8c2ce5 (patch) | |
| tree | 06d761559a50b8df3db4dffa32c6ad28ce398c11 /indra/newview/llfloaterfriends.cpp | |
| parent | f5b82a377256d5806ec101e8a9d90533ea1a3bf9 (diff) | |
| parent | bb977a194f42cafdcf3f1245adf3b7f49857e552 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterfriends.cpp')
| -rw-r--r-- | indra/newview/llfloaterfriends.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp index ccc5cab85a..4e2633d750 100644 --- a/indra/newview/llfloaterfriends.cpp +++ b/indra/newview/llfloaterfriends.cpp @@ -58,7 +58,7 @@ #include "llmenucommands.h" #include "llviewercontrol.h" #include "llviewermessage.h" -#include "lltimer.h" +#include "lleventtimer.h" #include "lltextbox.h" #include "llvoiceclient.h" |