summaryrefslogtreecommitdiff
path: root/indra/newview/lleventpoll.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-10-16 15:19:31 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-10-16 15:19:31 -0700
commit8f9da8b37d1983a2c2c69efec0ec9c8db9230c1a (patch)
treef99f53363efaa8ebc6379aa7d6f0969760286d14 /indra/newview/lleventpoll.cpp
parent4ddd7968757393657055f61bb51bef7c6e721ebf (diff)
parente7a5dc7cda09e65f8592793990c494a978a21271 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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)