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" // <FS:Ansariel> 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<LLFloaterIMNearbyChat>("nearby_chat"))->
-			showTranslationCheckbox(LLTranslate::isTranslationConfigured());
+	// [CHUI Merge] Was commented out before; still needs fixing
+	//(LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->
+	//		showTranslationCheckbox(LLTranslate::isTranslationConfigured());
+	// [CHUI Merge]
 	closeFloater(false);
 }