diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:28:40 -0700 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:28:40 -0700 |
commit | 3dc61c4b4afed47826070aa906e58c8c5ca3efa0 (patch) | |
tree | 078d2f9d44e5d6f0fc0f47cee388377eb8c0e0ed /indra/newview/lleventpoll.cpp | |
parent | 05a72687d848c13754039f6e720a137827533fdb (diff) | |
parent | c320b4878ae9cd166594285a88437f0d5c333353 (diff) |
merging in latest changes
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) |