summaryrefslogtreecommitdiff
path: root/indra/newview/llagentlanguage.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-15 08:44:18 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-15 08:44:18 +0100
commit08647d14c256cd6959a9853dc194614771a19501 (patch)
treecee1dbf7c126b0bc8e20ae36c5adc3055f2ba145 /indra/newview/llagentlanguage.h
parent7a3a192f790992bbb83461c0d24036580bfc3cdc (diff)
parent6f640f86ca09e16df5db5316f3e953d8c633249a (diff)
slightly hairy merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llagentlanguage.h')
-rw-r--r--indra/newview/llagentlanguage.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llagentlanguage.h b/indra/newview/llagentlanguage.h
index 45348a1e50..d7e6f3c6c7 100644
--- a/indra/newview/llagentlanguage.h
+++ b/indra/newview/llagentlanguage.h
@@ -33,14 +33,14 @@
#ifndef LL_LLAGENTLANGUAGE_H
#define LL_LLAGENTLANGUAGE_H
-#include "llsingleton.h" // LLSingleton<>
-#include "llevent.h"
-
-class LLAgentLanguage: public LLSingleton<LLAgentLanguage>, public LLOldEvents::LLSimpleListener
+class LLAgentLanguage
{
public:
- LLAgentLanguage();
+ static void init();
static bool update();
+
+ private:
+ static void onChange();
};
#endif // LL_LLAGENTLANGUAGE_H