summaryrefslogtreecommitdiff
path: root/indra/newview/llagentlanguage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llagentlanguage.cpp')
-rw-r--r--indra/newview/llagentlanguage.cpp26
1 files changed, 6 insertions, 20 deletions
diff --git a/indra/newview/llagentlanguage.cpp b/indra/newview/llagentlanguage.cpp
index 3d4e34a549..e97f136489 100644
--- a/indra/newview/llagentlanguage.cpp
+++ b/indra/newview/llagentlanguage.cpp
@@ -39,35 +39,21 @@
// library includes
#include "llui.h" // getLanguage()
-// static
-void LLAgentLanguage::init()
+LLAgentLanguage::LLAgentLanguage()
{
- gSavedSettings.getControl("Language")->getSignal()->connect(boost::bind(&onChange));
- gSavedSettings.getControl("InstallLanguage")->getSignal()->connect(boost::bind(&onChange));
- gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&onChange));
- gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&onChange));
+ gSavedSettings.getControl("Language")->getSignal()->connect(boost::bind(&update));
+ gSavedSettings.getControl("InstallLanguage")->getSignal()->connect(boost::bind(&update));
+ gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&update));
+ gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&update));
}
-// static
-void LLAgentLanguage::onChange()
-{
- // Clear inventory cache so that default names of inventory items
- // appear retranslated (EXT-8308).
- gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
-}
// send language settings to the sim
// static
bool LLAgentLanguage::update()
{
LLSD body;
- std::string url;
-
- if (gAgent.getRegion())
- {
- url = gAgent.getRegion()->getCapability("UpdateAgentLanguage");
- }
-
+ std::string url = gAgent.getRegion()->getCapability("UpdateAgentLanguage");
if (!url.empty())
{
std::string language = LLUI::getLanguage();