From 214906e2e4e4836dff9544805884b64dcd8f19a5 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 29 Jun 2013 04:24:27 +0200 Subject: [PATCH] Build fixes in llfloaterland.cpp and llfloatertranslationsettings.cpp --- indra/newview/llfloaterland.cpp | 1 + indra/newview/llfloatertranslationsettings.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index fe0d96fd74..1e606db9b4 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -81,6 +81,7 @@ #include "llregionhandle.h" #include "llworld.h" // For FIRE-1292 +#include "llsdutil.h" #ifdef OPENSIM #include "llviewernetwork.h" #endif // OPENSIM diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp index 33f2c35239..aa2db5554b 100644 --- a/indra/newview/llfloatertranslationsettings.cpp +++ b/indra/newview/llfloatertranslationsettings.cpp @@ -29,7 +29,7 @@ #include "llfloatertranslationsettings.h" // Viewer includes -#include "llfloaterimnearbychat.h" +//#include "llfloaterimnearbychat.h" #include "lltranslate.h" #include "llviewercontrol.h" // for gSavedSettings @@ -301,7 +301,9 @@ void LLFloaterTranslationSettings::onBtnOK() gSavedSettings.setString("TranslationService", getSelectedService()); gSavedSettings.setString("BingTranslateAPIKey", getEnteredBingKey()); gSavedSettings.setString("GoogleTranslateAPIKey", getEnteredGoogleKey()); - (LLFloaterReg::getTypedInstance("nearby_chat"))-> - showTranslationCheckbox(LLTranslate::isTranslationConfigured()); + // [CHUI Merge] Was commented out before; still needs fixing + //(LLFloaterReg::getTypedInstance("nearby_chat"))-> + // showTranslationCheckbox(LLTranslate::isTranslationConfigured()); + // [CHUI Merge] closeFloater(false); }