diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-15 08:44:18 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-15 08:44:18 +0100 |
| commit | 08647d14c256cd6959a9853dc194614771a19501 (patch) | |
| tree | cee1dbf7c126b0bc8e20ae36c5adc3055f2ba145 /indra/newview/llappviewer.cpp | |
| parent | 7a3a192f790992bbb83461c0d24036580bfc3cdc (diff) | |
| parent | 6f640f86ca09e16df5db5316f3e953d8c633249a (diff) | |
slightly hairy merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d8b2866a9f..296e3b7e86 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -45,6 +45,7 @@ #include "llgroupmgr.h" #include "llagent.h" #include "llagentcamera.h" +#include "llagentlanguage.h" #include "llagentwearables.h" #include "llwindow.h" #include "llviewerstats.h" @@ -946,6 +947,8 @@ bool LLAppViewer::init() LLStringOps::sPM = LLTrans::getString("dateTimePM"); } + LLAgentLanguage::init(); + return true; } |