diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
commit | 90b8fb07ccd46bd18f3629ae2ec04a47312b41cb (patch) | |
tree | 2e0a016cf2a0a3a869086dbde4e2f372bfe3f2c1 /indra/newview/llfloatertranslationsettings.cpp | |
parent | e826cbd90750fd38565e4e44390948f36254cf1f (diff) | |
parent | e859c3446b5c631fe0a9806434aa19b64a0d9113 (diff) |
Merge with latest from viewer-experience
Diffstat (limited to 'indra/newview/llfloatertranslationsettings.cpp')
-rw-r--r-- | indra/newview/llfloatertranslationsettings.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp index 959edff713..428a02e9f0 100644 --- a/indra/newview/llfloatertranslationsettings.cpp +++ b/indra/newview/llfloatertranslationsettings.cpp @@ -29,6 +29,7 @@ #include "llfloatertranslationsettings.h" // Viewer includes +#include "llnearbychatbar.h" #include "lltranslate.h" #include "llviewercontrol.h" // for gSavedSettings @@ -292,5 +293,6 @@ void LLFloaterTranslationSettings::onBtnOK() gSavedSettings.setString("TranslationService", getSelectedService()); gSavedSettings.setString("BingTranslateAPIKey", getEnteredBingKey()); gSavedSettings.setString("GoogleTranslateAPIKey", getEnteredGoogleKey()); + LLNearbyChatBar::getInstance()->enableTranslationCheckbox(LLTranslate::isTranslationConfigured()); closeFloater(false); } |