diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-06-04 16:24:21 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-06-04 16:24:21 +0000 |
| commit | 087bd265534b8e3086ae1af441a9cf0eb7c684df (patch) | |
| tree | a0c911515476d4ac4aac9bd984de28eb7573a478 /indra/newview/llnetmap.h | |
| parent | f9b9372027a41900ad572afcd7ea0d2cc5489b8f (diff) | |
Merge of QAR-1383 event-system-7 into trunk.
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
Diffstat (limited to 'indra/newview/llnetmap.h')
| -rw-r--r-- | indra/newview/llnetmap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index a5bf9f0fb5..9fbd5097fd 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -109,31 +109,31 @@ private: class LLScaleMap : public LLMemberListener<LLNetMap> { public: - /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); + /*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); }; class LLStopTracking : public LLMemberListener<LLNetMap> { public: - /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); + /*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); }; class LLEnableTracking : public LLMemberListener<LLNetMap> { public: - /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); + /*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); }; class LLShowAgentProfile : public LLMemberListener<LLNetMap> { public: - /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); + /*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); }; class LLEnableProfile : public LLMemberListener<LLNetMap> { public: - /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); + /*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); }; }; |