diff options
| author | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
| commit | e0432f98ee515f9777604aa784d28b63d2abfe40 (patch) | |
| tree | 398fcae43d9904bde2112a7085c7ef7c1a926100 /indra/newview/lleventpoll.cpp | |
| parent | bf87920fc91e2ca2b8d9f6f2656ad632c3005164 (diff) | |
| parent | f5a47417fde70f78b99744386c6da0bcf78e60d5 (diff) | |
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
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) |