livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fixes in llfloaterland.cpp and llfloatertranslationsettings.cpp

master
Ansariel 2013-06-29 04:24:27 +02:00
parent ae6d93f759
commit 214906e2e4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloaterland.cpp
View File

@ -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

8
indra/newview/llfloatertranslationsettings.cpp
View File

@ -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);
}