summaryrefslogtreecommitdiff
path: root/indra/newview/lleventpoll.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-10-17 14:32:29 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-10-17 14:32:29 -0700
commit9da9b2d84be4c9bb2f0f8208ada6f67e8a53a7e8 (patch)
treeb9f0da0557b8ec0e5a1d7599caa0389795457068 /indra/newview/lleventpoll.cpp
parent2f8e4f240881fe990699872eafb6d7dceb5e5a9f (diff)
parenta7f6dcaef7fb49901a2ebf0629e3089fa8cdad98 (diff)
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/lleventpoll.cpp')
-rw-r--r--indra/newview/lleventpoll.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index 4f4d9a40b4..2c786b7f8b 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -86,7 +86,7 @@ namespace
class LLEventPollEventTimer : public LLEventTimer
{
- typedef boost::intrusive_ptr<LLEventPollResponder> EventPollResponderPtr;
+ typedef LLPointer<LLEventPollResponder> EventPollResponderPtr;
public:
LLEventPollEventTimer(F32 period, EventPollResponderPtr responder)