summaryrefslogtreecommitdiff
path: root/indra/newview/lleventpoll.cpp
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2012-10-18 22:29:02 +0300
committerMaximB ProductEngine <mberezhnoy@productengine.com>2012-10-18 22:29:02 +0300
commitc43cfcdcbd243410e2f780f58f93100e96fc996c (patch)
treed5daa0187843a9302c1011937d452d40692d0d1a /indra/newview/lleventpoll.cpp
parentc0b60841ce14a1c449ede17284d2aa6939322be3 (diff)
parentf9c068462f379a4678e59090a066cfa173504c6b (diff)
merge into latest changes
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)