diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-08 14:58:53 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-08 14:58:53 -0500 |
| commit | 399d70eede54dff2ba6d14b33f85fdad4d33a662 (patch) | |
| tree | ce922e0963b8d46c236c4320b574916507fa3b65 /indra/newview/llfloaterfriends.cpp | |
| parent | 7e1932878563e5847335d5dcb66c9b23232c372c (diff) | |
| parent | 19f4240f977fc26d97e686c4e3a1f13b063e191c (diff) | |
automated merge viewer2.0->viewer2.0
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" |