summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-08 14:58:53 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-08 14:58:53 -0500
commit399d70eede54dff2ba6d14b33f85fdad4d33a662 (patch)
treece922e0963b8d46c236c4320b574916507fa3b65 /indra/newview/llpanelpeople.cpp
parent7e1932878563e5847335d5dcb66c9b23232c372c (diff)
parent19f4240f977fc26d97e686c4e3a1f13b063e191c (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rw-r--r--indra/newview/llpanelpeople.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 423ee61e25..36fab86280 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -36,6 +36,7 @@
#include "llfloaterreg.h"
#include "llmenugl.h"
#include "llnotificationsutil.h"
+#include "lleventtimer.h"
#include "llfiltereditor.h"
#include "lltabcontainer.h"
#include "lluictrlfactory.h"