diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2009-05-08 21:08:08 +0000 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2009-05-08 21:08:08 +0000 |
commit | 3800c0df910c83e987184d541b868168fc2b5bec (patch) | |
tree | 91bcf4e13972ae02b9d6500c1d14de7bb8d37dc4 /indra/newview/llagentlanguage.h | |
parent | 5da967dc744f35d5270c7cb0b8b23b993ecda3e1 (diff) |
svn merge -r114679:114681 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8
Diffstat (limited to 'indra/newview/llagentlanguage.h')
-rw-r--r-- | indra/newview/llagentlanguage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentlanguage.h b/indra/newview/llagentlanguage.h index e313837883..45348a1e50 100644 --- a/indra/newview/llagentlanguage.h +++ b/indra/newview/llagentlanguage.h @@ -36,7 +36,7 @@ #include "llsingleton.h" // LLSingleton<> #include "llevent.h" -class LLAgentLanguage: public LLSingleton<LLAgentLanguage>, public LLSimpleListener +class LLAgentLanguage: public LLSingleton<LLAgentLanguage>, public LLOldEvents::LLSimpleListener { public: LLAgentLanguage(); |