diff options
author | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
commit | 0cdff2817bdc342e0ac8b3c8711e3f7a72f1f617 (patch) | |
tree | 0fbaca9292450f05588336eb6639b12d182156e1 /indra/newview/lleventpoll.cpp | |
parent | 03fa24f8aecc071bac920a400c122cbce0b029b4 (diff) | |
parent | 1743e6a81330824021667000f8acdd6cf64dbf1b (diff) |
Merge
Diffstat (limited to 'indra/newview/lleventpoll.cpp')
-rw-r--r-- | indra/newview/lleventpoll.cpp | 2 |
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) |