diff options
41 files changed, 104 insertions, 116 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index f888d7ff68..62c26709d8 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -310,7 +310,7 @@ void LLFloaterReg::showInitialVisibleInstances() std::string controlname = getVisibilityControlName(name); if (LLFloater::getControlGroup()->controlExists(controlname)) { - BOOL isvis = LLFloater::getControlGroup()->getBOOL(controlname); + bool isvis = LLFloater::getControlGroup()->getBOOL(controlname); if (isvis) { showInstance(name, LLSD()); // keyed floaters shouldn't set save_vis to true diff --git a/indra/llui/llstatview.cpp b/indra/llui/llstatview.cpp index bb4969c81f..4e74172777 100644 --- a/indra/llui/llstatview.cpp +++ b/indra/llui/llstatview.cpp @@ -40,7 +40,7 @@ LLStatView::LLStatView(const LLStatView::Params& p) : LLContainerView(p), mSetting(p.setting) { - BOOL isopen = getDisplayChildren(); + bool isopen = getDisplayChildren(); if (mSetting.length() > 0) { isopen = LLUI::getInstance()->mSettingGroups["config"]->getBOOL(mSetting); @@ -53,7 +53,7 @@ LLStatView::~LLStatView() // Children all cleaned up by default view destructor. if (mSetting.length() > 0) { - BOOL isopen = getDisplayChildren(); + bool isopen = getDisplayChildren(); LLUI::getInstance()->mSettingGroups["config"]->setBOOL(mSetting, isopen); } } diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 1a474cca90..2b44e61dea 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -58,7 +58,7 @@ typedef std::map<std::string, LLControlGroup*> settings_map_t; settings_map_t LLUI::sSettingGroups; -BOOL LLControlGroup::getBOOL(const std::string& name) +bool LLControlGroup::getBOOL(const std::string& name) { return false; } diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 2c04147a5a..e215ff57fb 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -59,8 +59,6 @@ template <> eControlType get_control_type<U32>(); template <> eControlType get_control_type<S32>(); template <> eControlType get_control_type<F32>(); template <> eControlType get_control_type<bool>(); -// Yay BOOL, its really an S32. -//template <> eControlType get_control_type<BOOL> () ; template <> eControlType get_control_type<std::string>(); template <> eControlType get_control_type<LLVector3>(); @@ -465,7 +463,7 @@ std::string LLControlGroup::typeEnumToString(eControlType typeenum) return mTypeString[typeenum]; } -LLControlVariable* LLControlGroup::declareControl(const std::string& name, eControlType type, const LLSD initial_val, const std::string& comment, LLControlVariable::ePersist persist, BOOL hidefromsettingseditor) +LLControlVariable* LLControlGroup::declareControl(const std::string& name, eControlType type, const LLSD initial_val, const std::string& comment, LLControlVariable::ePersist persist, bool hidefromsettingseditor) { LLControlVariable* existing_control = getControl(name); if (existing_control) @@ -562,9 +560,9 @@ void LLControlGroup::incrCount(const std::string& name) getCount[name] = getCount[name].asInteger() + 1; } -BOOL LLControlGroup::getBOOL(const std::string& name) +bool LLControlGroup::getBOOL(const std::string& name) { - return (BOOL)get<bool>(name); + return get<bool>(name); } S32 LLControlGroup::getS32(const std::string& name) @@ -659,7 +657,7 @@ LLSD LLControlGroup::asLLSD(bool diffs_only) return result; } -BOOL LLControlGroup::controlExists(const std::string& name) +bool LLControlGroup::controlExists(const std::string& name) { ctrl_name_table_t::iterator iter = mNameTable.find(name); return iter != mNameTable.end(); @@ -670,7 +668,7 @@ BOOL LLControlGroup::controlExists(const std::string& name) // Set functions //------------------------------------------------------------------- -void LLControlGroup::setBOOL(const std::string& name, BOOL val) +void LLControlGroup::setBOOL(const std::string& name, bool val) { set<bool>(name, val); } @@ -755,7 +753,7 @@ void LLControlGroup::setUntypedValue(const std::string& name, const LLSD& val) //--------------------------------------------------------------- // Returns number of controls loaded, so 0 if failure -U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require_declaration, eControlType declare_as) +U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, bool require_declaration, eControlType declare_as) { std::string name; @@ -791,7 +789,7 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require { name = child_nodep->getName(); - BOOL declared = controlExists(name); + bool declared = controlExists(name); if (require_declaration && !declared) { @@ -952,7 +950,7 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require return validitems; } -U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only) +U32 LLControlGroup::saveToFile(const std::string& filename, bool nondefault_only) { LLSD settings; int num_saved = 0; @@ -1162,7 +1160,7 @@ void main() bar = new LLControlVariable<S32>("gBar", 10, 2, 22); gGlobals.addEntry("gBar", bar); - baz = new LLControlVariable<BOOL>("gBaz", FALSE); + baz = new LLControlVariable<bool>("gBaz", false); gGlobals.addEntry("gBaz", baz); // test retrieval @@ -1224,13 +1222,7 @@ template <> eControlType get_control_type<bool> () { return TYPE_BOOLEAN; } -/* -// Yay BOOL, its really an S32. -template <> eControlType get_control_type<BOOL> () -{ - return TYPE_BOOLEAN; -} -*/ + template <> eControlType get_control_type<std::string>() { return TYPE_STRING; @@ -1485,7 +1477,6 @@ DECL_LLCC(U32, (U32)666); DECL_LLCC(S32, (S32)-666); DECL_LLCC(F32, (F32)-666.666); DECL_LLCC(bool, true); -DECL_LLCC(BOOL, FALSE); static LLCachedControl<std::string> mySetting_string("TestCachedControlstring", "Default String Value"); DECL_LLCC(LLVector3, LLVector3(1.0f, 2.0f, 3.0f)); DECL_LLCC(LLVector3d, LLVector3d(6.0f, 5.0f, 4.0f)); @@ -1506,7 +1497,6 @@ void test_cached_control() TEST_LLCC(S32, (S32)-666); TEST_LLCC(F32, (F32)-666.666); TEST_LLCC(bool, true); - TEST_LLCC(BOOL, FALSE); if((std::string)mySetting_string != "Default String Value") LL_ERRS() << "Fail string" << LL_ENDL; TEST_LLCC(LLVector3, LLVector3(1.0f, 2.0f, 3.0f)); TEST_LLCC(LLVector3d, LLVector3d(6.0f, 5.0f, 4.0f)); diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index d682b2c7c7..2289dc8841 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -210,7 +210,7 @@ public: }; void applyToAll(ApplyFunctor* func); - LLControlVariable* declareControl(const std::string& name, eControlType type, const LLSD initial_val, const std::string& comment, LLControlVariable::ePersist persist, BOOL hidefromsettingseditor = FALSE); + LLControlVariable* declareControl(const std::string& name, eControlType type, const LLSD initial_val, const std::string& comment, LLControlVariable::ePersist persist, bool hidefromsettingseditor = false); LLControlVariable* declareU32(const std::string& name, U32 initial_val, const std::string& comment, LLControlVariable::ePersist persist = LLControlVariable::PERSIST_NONDFT); LLControlVariable* declareS32(const std::string& name, S32 initial_val, const std::string& comment, LLControlVariable::ePersist persist = LLControlVariable::PERSIST_NONDFT); LLControlVariable* declareF32(const std::string& name, F32 initial_val, const std::string& comment, LLControlVariable::ePersist persist = LLControlVariable::PERSIST_NONDFT); @@ -226,7 +226,7 @@ public: std::string getString(const std::string& name); std::string getText(const std::string& name); - BOOL getBOOL(const std::string& name); + bool getBOOL(const std::string& name); S32 getS32(const std::string& name); F32 getF32(const std::string& name); U32 getU32(const std::string& name); @@ -265,7 +265,7 @@ public: return convert_from_llsd<T>(value, type, name); } - void setBOOL(const std::string& name, BOOL val); + void setBOOL(const std::string& name, bool val); void setS32(const std::string& name, S32 val); void setF32(const std::string& name, F32 val); void setU32(const std::string& name, U32 val); @@ -295,13 +295,13 @@ public: } } - BOOL controlExists(const std::string& name); + bool controlExists(const std::string& name); // Returns number of controls loaded, 0 if failed // If require_declaration is false, will auto-declare controls it finds // as the given type. - U32 loadFromFileLegacy(const std::string& filename, BOOL require_declaration = TRUE, eControlType declare_as = TYPE_STRING); - U32 saveToFile(const std::string& filename, BOOL nondefault_only); + U32 loadFromFileLegacy(const std::string& filename, bool require_declaration = true, eControlType declare_as = TYPE_STRING); + U32 saveToFile(const std::string& filename, bool nondefault_only); U32 loadFromFile(const std::string& filename, bool default_values = false, bool save_values = true); void resetToDefaults(); void incrCount(const std::string& name); @@ -435,8 +435,6 @@ template <> eControlType get_control_type<U32>(); template <> eControlType get_control_type<S32>(); template <> eControlType get_control_type<F32>(); template <> eControlType get_control_type<bool>(); -// Yay BOOL, its really an S32. -//template <> eControlType get_control_type<BOOL> () template <> eControlType get_control_type<std::string>(); template <> eControlType get_control_type<LLVector3>(); template <> eControlType get_control_type<LLVector3d>(); diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index 21a7dee4cc..d5b8b36d86 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -296,7 +296,7 @@ public: XML_Parser *mParser; // Temporary pointer while loading - BOOL mIsAttribute; // Flag is only used for output formatting + bool mIsAttribute; // Flag is only used for output formatting U32 mVersionMajor; // Version of this tag to use U32 mVersionMinor; U32 mLength; // If the length is nonzero, then only return arrays of this length diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 8977b145d1..ae021b7f37 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -160,7 +160,7 @@ LLAgentCamera::LLAgentCamera() : mFocusObject(NULL), mFocusObjectDist(0.f), mFocusObjectOffset(), - mTrackFocusObject(TRUE), + mTrackFocusObject(true), mAtKey(0), // Either 1, 0, or -1... indicates that movement-key is pressed mWalkKey(0), // like AtKey, but causes less forward thrust diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index d27cdb0c5c..26ca02f8fa 100644 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -231,7 +231,7 @@ private: LLPointer<LLViewerObject> mFocusObject; F32 mFocusObjectDist; LLVector3 mFocusObjectOffset; - BOOL mTrackFocusObject; + bool mTrackFocusObject; //-------------------------------------------------------------------- // Lookat / Pointat diff --git a/indra/newview/llagentlanguage.cpp b/indra/newview/llagentlanguage.cpp index cdb0e3302d..4e039cae6a 100644 --- a/indra/newview/llagentlanguage.cpp +++ b/indra/newview/llagentlanguage.cpp @@ -48,7 +48,7 @@ void LLAgentLanguage::onChange() { // Clear inventory cache so that default names of inventory items // appear retranslated (EXT-8308). - gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE); + gSavedSettings.setBOOL("PurgeCacheOnNextStartup", true); } // send language settings to the sim diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 930c5e4947..bf5045f24c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2572,7 +2572,7 @@ bool LLAppViewer::initConfiguration() c->setValue(true, false); } - gSavedSettings.setBOOL("QAMode", TRUE ); + gSavedSettings.setBOOL("QAMode", true ); gSavedSettings.setS32("WatchdogEnabled", 0); #endif @@ -2634,7 +2634,7 @@ bool LLAppViewer::initConfiguration() // like determining screen DPI value and so on mIsFirstRun = true; - gSavedSettings.setBOOL("FirstRunThisInstall", FALSE); + gSavedSettings.setBOOL("FirstRunThisInstall", false); } if (clp.hasOption("sessionsettings")) @@ -2774,7 +2774,7 @@ bool LLAppViewer::initConfiguration() gDebugGL = true; // gDebugGL can cause excessive logging // so it's limited to a single session - gSavedSettings.setBOOL("RenderDebugGLSession", FALSE); + gSavedSettings.setBOOL("RenderDebugGLSession", false); } const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent"); @@ -3137,8 +3137,8 @@ bool LLAppViewer::initWindow() } // Set this flag in case we crash while initializing GL - gSavedSettings.setBOOL("RenderInitError", TRUE); - gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE ); + gSavedSettings.setBOOL("RenderInitError", true); + gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), true ); gPipeline.init(); LL_INFOS("AppInit") << "gPipeline Initialized" << LL_ENDL; @@ -3146,8 +3146,8 @@ bool LLAppViewer::initWindow() stop_glerror(); gViewerWindow->initGLDefaults(); - gSavedSettings.setBOOL("RenderInitError", FALSE); - gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE ); + gSavedSettings.setBOOL("RenderInitError", false); + gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), true ); //If we have a startup crash, it's usually near GL initialization, so simulate that. if(gCrashOnStartup) @@ -3162,7 +3162,7 @@ bool LLAppViewer::initWindow() if (gSavedSettings.getBOOL("FirstLoginThisInstall") && meetsRequirementsForMaximizedStart()) { LL_INFOS("AppInit") << "This client met the requirements for a maximized initial screen." << LL_ENDL; - gSavedSettings.setBOOL("WindowMaximized", TRUE); + gSavedSettings.setBOOL("WindowMaximized", true); } if (gSavedSettings.getBOOL("WindowMaximized")) @@ -3517,9 +3517,9 @@ std::string LLAppViewer::getViewerInfoString(bool default_string) const void LLAppViewer::cleanupSavedSettings() { - gSavedSettings.setBOOL("MouseSun", FALSE); + gSavedSettings.setBOOL("MouseSun", false); - gSavedSettings.setBOOL("UseEnergy", TRUE); // force toggle to turn off, since sends message to simulator + gSavedSettings.setBOOL("UseEnergy", true); // force toggle to turn off, since sends message to simulator gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc); @@ -4097,7 +4097,7 @@ void LLAppViewer::migrateCacheDirectory() // Only do this once per fresh install of this version. if (gSavedSettings.getBOOL("MigrateCacheDirectory")) { - gSavedSettings.setBOOL("MigrateCacheDirectory", FALSE); + gSavedSettings.setBOOL("MigrateCacheDirectory", false); std::string old_cache_dir = gDirUtilp->add(gDirUtilp->getOSUserAppDir(), "cache"); std::string new_cache_dir = gDirUtilp->getCacheDir(true); @@ -4439,7 +4439,7 @@ void LLAppViewer::saveFinalSnapshot() gSavedSettings.setVector3d("CameraPosOnLogout", gAgentCamera.calcCameraPositionTargetGlobal()); gViewerWindow->setCursor(UI_CURSOR_WAIT); gAgentCamera.changeCameraToThirdPerson( FALSE ); // don't animate, need immediate switch - gSavedSettings.setBOOL("ShowParcelOwners", FALSE); + gSavedSettings.setBOOL("ShowParcelOwners", false); idle(); std::string snap_filename = gDirUtilp->getLindenUserDir(); diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 775d27221b..1a9f67ceda 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -878,12 +878,12 @@ bool LLAppViewerWin32::initHardwareTest() LLWeb::loadURLExternal("http://secondlife.com/support/", false); return false; } - gWarningSettings.setBOOL("AboutDirectX9", FALSE); + gWarningSettings.setBOOL("AboutDirectX9", false); } LL_DEBUGS("AppInit") << "Done polling DirectX for hardware info" << LL_ENDL; // Only probe once after installation - gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE); + gSavedSettings.setBOOL("ProbeHardwareOnStartup", false); // Disable so debugger can work std::string splash_msg; diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index 72f667a0b8..8d3323aa66 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -417,7 +417,7 @@ void LLChatBar::startChat(const char* line) // gChatBar->setVisible(TRUE); // gChatBar->setKeyboardFocus(TRUE); -// gSavedSettings.setBOOL("ChatVisible", TRUE); +// gSavedSettings.setBOOL("ChatVisible", true); // // if (line && gChatBar->mInputEditor) // { @@ -455,7 +455,7 @@ void LLChatBar::stopChat() // // // hide chat bar so it doesn't grab focus back // gChatBar->setVisible(FALSE); -// gSavedSettings.setBOOL("ChatVisible", FALSE); +// gSavedSettings.setBOOL("ChatVisible", false); } // static @@ -566,7 +566,7 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL { // as soon as we say something, we no longer care about teaching the user // how to chat - gWarningSettings.setBOOL("FirstOtherChatBeforeUser", FALSE); + gWarningSettings.setBOOL("FirstOtherChatBeforeUser", false); // Look for "/20 foo" channel chats. S32 channel = 0; diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index f482d5a37d..523c82497e 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -568,7 +568,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures) // handle all the different types if(ctrl->isType(TYPE_BOOLEAN)) { - gSavedSettings.setBOOL(mIt->first, (BOOL)getRecommendedValue(mIt->first)); + gSavedSettings.setBOOL(mIt->first, (bool)getRecommendedValue(mIt->first)); } else if (ctrl->isType(TYPE_S32)) { diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index 1ce9fe3a7a..cfb766552a 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -144,7 +144,7 @@ void LLFirstUse::firstUseNotification(const std::string& control_var, bool enabl LL_DEBUGS("LLFirstUse") << "Disabling first use notification " << notification_name << LL_ENDL; LLNotifications::instance().cancelByName(notification_name); // redundantly clear settings var here, in case there are no notifications to cancel - gWarningSettings.setBOOL(control_var, FALSE); + gWarningSettings.setBOOL(control_var, false); } } @@ -169,7 +169,7 @@ bool LLFirstUse::processNotification(const LLSD& notify) if (notification) { // disable any future notifications - gWarningSettings.setBOOL(notification->getPayload()["control_var"], FALSE); + gWarningSettings.setBOOL(notification->getPayload()["control_var"], false); } } return false; diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp index abc9cdbcc2..392866682d 100644 --- a/indra/newview/llfloaterbulkpermission.cpp +++ b/indra/newview/llfloaterbulkpermission.cpp @@ -204,10 +204,10 @@ void LLFloaterBulkPermission::onCloseBtn() void LLFloaterBulkPermission::onCommitCopy() { // Implements fair use - BOOL copyable = gSavedSettings.getBOOL("BulkChangeNextOwnerCopy"); + bool copyable = gSavedSettings.getBOOL("BulkChangeNextOwnerCopy"); if(!copyable) { - gSavedSettings.setBOOL("BulkChangeNextOwnerTransfer", TRUE); + gSavedSettings.setBOOL("BulkChangeNextOwnerTransfer", true); } LLCheckBoxCtrl* xfer =getChild<LLCheckBoxCtrl>("next_owner_transfer"); xfer->setEnabled(copyable); diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp index c0bb213540..eb1f7f7965 100644 --- a/indra/newview/llfloaterhelpbrowser.cpp +++ b/indra/newview/llfloaterhelpbrowser.cpp @@ -74,7 +74,7 @@ void LLFloaterHelpBrowser::buildURLHistory() void LLFloaterHelpBrowser::onOpen(const LLSD& key) { - gSavedSettings.setBOOL("HelpFloaterOpen", TRUE); + gSavedSettings.setBOOL("HelpFloaterOpen", true); std::string topic = key.asString(); mBrowser->navigateTo(LLViewerHelp::instance().getURL(topic)); @@ -85,7 +85,7 @@ void LLFloaterHelpBrowser::onClose(bool app_quitting) { if (!app_quitting) { - gSavedSettings.setBOOL("HelpFloaterOpen", FALSE); + gSavedSettings.setBOOL("HelpFloaterOpen", false); } // really really destroy the help browser when it's closed, it'll be recreated. destroy(); // really destroy this dialog on closure, it's relatively heavyweight. diff --git a/indra/newview/llfloaterperformance.cpp b/indra/newview/llfloaterperformance.cpp index 19fc3e673e..fe85672c54 100644 --- a/indra/newview/llfloaterperformance.cpp +++ b/indra/newview/llfloaterperformance.cpp @@ -732,7 +732,7 @@ void LLFloaterPerformance::enableAutotuneWarning() { if (!gSavedPerAccountSettings.getBOOL("HadEnabledAutoFPS") && LLPerfStats::tunables.userAutoTuneEnabled) { - gSavedPerAccountSettings.setBOOL("HadEnabledAutoFPS", TRUE); + gSavedPerAccountSettings.setBOOL("HadEnabledAutoFPS", true); LLNotificationsUtil::add("EnableAutoFPSWarning", LLSD(), LLSD(), [](const LLSD& notif, const LLSD& resp) diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index b53839977e..4f67bead78 100644 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -162,10 +162,10 @@ void LLFloaterPermsDefault::onCommitCopy(const LLSD& user_data) // Implements fair use std::string prefix = user_data.asString(); - BOOL copyable = gSavedSettings.getBOOL(prefix+"NextOwnerCopy"); + bool copyable = gSavedSettings.getBOOL(prefix+"NextOwnerCopy"); if(!copyable) { - gSavedSettings.setBOOL(prefix+"NextOwnerTransfer", TRUE); + gSavedSettings.setBOOL(prefix+"NextOwnerTransfer", true); } LLCheckBoxCtrl* xfer = getChild<LLCheckBoxCtrl>(prefix+"_transfer"); xfer->setEnabled(copyable); diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index ab9714b89f..19a4081eba 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -180,7 +180,7 @@ bool callback_clear_cache(const LLSD& notification, const LLSD& response) if ( option == 0 ) // YES { // flag client texture cache for clearing next time the client runs - gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE); + gSavedSettings.setBOOL("PurgeCacheOnNextStartup", true); LLNotificationsUtil::add("CacheWillClear"); } @@ -200,7 +200,7 @@ bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response LLNavigationBar::getInstance()->clearHistoryCache(); // flag client texture cache for clearing next time the client runs - gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE); + gSavedSettings.setBOOL("PurgeCacheOnNextStartup", true); LLNotificationsUtil::add("CacheWillClear"); LLSearchHistory::getInstance()->clearHistory(); @@ -861,7 +861,7 @@ void LLFloaterPreference::setRecommendedSettings() void LLFloaterPreference::resetAutotuneSettings() { - gSavedSettings.setBOOL("AutoTuneFPS", FALSE); + gSavedSettings.setBOOL("AutoTuneFPS", false); const std::string autotune_settings[] = { "AutoTuneLock", @@ -1327,7 +1327,7 @@ void LLFloaterPreference::onClickEnablePopup() LLNotificationTemplatePtr templatep = LLNotifications::instance().getTemplate(*(std::string*)((*itor)->getUserdata())); //gSavedSettings.setWarning(templatep->mName, TRUE); std::string notification_name = templatep->mName; - LLUI::getInstance()->mSettingGroups["ignores"]->setBOOL(notification_name, TRUE); + LLUI::getInstance()->mSettingGroups["ignores"]->setBOOL(notification_name, true); } buildPopupLists(); diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 1e106ed3b1..f9bb954b82 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -1552,7 +1552,7 @@ bool LLPanelRegionTerrainInfo::callbackTextureHeights(const LLSD& notification, } else if (option == 2) // don't ask { - gSavedSettings.setBOOL("RegionCheckTextureHeights", FALSE); + gSavedSettings.setBOOL("RegionCheckTextureHeights", false); mConfirmedTextureHeights = true; } diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index ca93bf9012..847bba3e9d 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -594,7 +594,7 @@ void LLFloaterReporter::showFromMenu(EReportType report_type) LLFloaterReporter* reporter_floater = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter"); if(reporter_floater && reporter_floater->isInVisibleChain()) { - gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", FALSE); + gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", false); } reporter_floater = LLFloaterReg::showTypedInstance<LLFloaterReporter>("reporter", LLSD()); if (reporter_floater) @@ -609,7 +609,7 @@ void LLFloaterReporter::show(const LLUUID& object_id, const std::string& avatar_ LLFloaterReporter* reporter_floater = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter"); if(reporter_floater && reporter_floater->isInVisibleChain()) { - gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", FALSE); + gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", false); } reporter_floater = LLFloaterReg::showTypedInstance<LLFloaterReporter>("reporter"); if (avatar_name.empty()) @@ -637,7 +637,7 @@ void LLFloaterReporter::showFromExperience( const LLUUID& experience_id ) LLFloaterReporter* reporter_floater = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter"); if(reporter_floater && reporter_floater->isInVisibleChain()) { - gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", FALSE); + gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", false); } reporter_floater = LLFloaterReg::showTypedInstance<LLFloaterReporter>("reporter"); reporter_floater->getExperienceInfo(experience_id); @@ -873,7 +873,7 @@ void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url void LLFloaterReporter::takeScreenshot(bool use_prev_screenshot) { - gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", TRUE); + gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", true); if(!use_prev_screenshot) { std::string screenshot_filename(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_PREV_FILENAME); diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 66ec222201..0c8a93dc2a 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -220,7 +220,7 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate } // freeze everything else - gSavedSettings.setBOOL("FreezeTime", TRUE); + gSavedSettings.setBOOL("FreezeTime", true); if (LLToolMgr::getInstance()->getCurrentToolset() != gCameraToolset) { @@ -243,7 +243,7 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate floaterp->impl->mAvatarPauseHandles.clear(); // thaw everything else - gSavedSettings.setBOOL("FreezeTime", FALSE); + gSavedSettings.setBOOL("FreezeTime", false); // restore last tool (e.g. pie menu, etc) if (floaterp->impl->mLastToolset) @@ -956,7 +956,7 @@ LLFloaterSnapshotBase::~LLFloaterSnapshotBase() if (impl->mPreviewHandle.get()) impl->mPreviewHandle.get()->die(); //unfreeze everything else - gSavedSettings.setBOOL("FreezeTime", FALSE); + gSavedSettings.setBOOL("FreezeTime", false); if (impl->mLastToolset) { @@ -1164,7 +1164,7 @@ void LLFloaterSnapshotBase::onClose(bool app_quitting) previewp->setEnabled(FALSE); } - gSavedSettings.setBOOL("FreezeTime", FALSE); + gSavedSettings.setBOOL("FreezeTime", false); impl->mAvatarPauseHandles.clear(); if (impl->mLastToolset) diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 5fb4fb9b07..ff7214def0 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -904,7 +904,7 @@ void LLFloaterTools::onClose(bool app_quitting) // exit component selection mode LLSelectMgr::getInstance()->promoteSelectionToRoot(); - gSavedSettings.setBOOL("EditLinkedParts", FALSE); + gSavedSettings.setBOOL("EditLinkedParts", false); gViewerWindow->showCursor(); @@ -1092,7 +1092,7 @@ void commit_select_component(void *data) void LLFloaterTools::setObjectType( LLPCode pcode ) { LLToolPlacer::setObjectType( pcode ); - gSavedSettings.setBOOL("CreateToolCopySelection", FALSE); + gSavedSettings.setBOOL("CreateToolCopySelection", false); gFocusMgr.setMouseCapture(NULL); } diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 3987da1ad3..b699b98154 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -1691,11 +1691,11 @@ void LLFloaterWorldMap::onChangeMaturity() // disable mature / adult events. if (!can_access_mature) { - gSavedSettings.setBOOL("ShowMatureEvents", FALSE); + gSavedSettings.setBOOL("ShowMatureEvents", false); } if (!can_access_adult) { - gSavedSettings.setBOOL("ShowAdultEvents", FALSE); + gSavedSettings.setBOOL("ShowAdultEvents", false); } } diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 01496fa7ce..807bd2c331 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -198,7 +198,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia requested_options.append("global-textures"); if(gSavedSettings.getBOOL("ConnectAsGod")) { - gSavedSettings.setBOOL("UseDebugMenus", TRUE); + gSavedSettings.setBOOL("UseDebugMenus", true); requested_options.append("god-connect"); } diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 025a653c47..1fd1462d66 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -428,7 +428,7 @@ void LLPanelLogin::addFavoritesToStartLocation() } if (update_password_setting) { - gSavedSettings.setBOOL("UpdateRememberPasswordSetting", TRUE); + gSavedSettings.setBOOL("UpdateRememberPasswordSetting", true); } break; } @@ -1101,7 +1101,7 @@ void LLPanelLogin::onRememberPasswordCheck(void*) { if (sInstance) { - gSavedSettings.setBOOL("UpdateRememberPasswordSetting", TRUE); + gSavedSettings.setBOOL("UpdateRememberPasswordSetting", true); LLPointer<LLCredential> cred; bool remember_user, remember_password; diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp index 28631e2b7b..9f8b3f2b19 100644 --- a/indra/newview/llpanelvoicedevicesettings.cpp +++ b/indra/newview/llpanelvoicedevicesettings.cpp @@ -99,7 +99,7 @@ void LLPanelVoiceDeviceSettings::onVisibilityChange ( BOOL new_visibility ) cleanup(); // when closing this window, turn of visiblity control so that // next time preferences is opened we don't suspend voice - gSavedSettings.setBOOL("ShowDeviceSettings", FALSE); + gSavedSettings.setBOOL("ShowDeviceSettings", false); } } void LLPanelVoiceDeviceSettings::draw() diff --git a/indra/newview/llperfstats.cpp b/indra/newview/llperfstats.cpp index 64e66d520b..af407c73f1 100644 --- a/indra/newview/llperfstats.cpp +++ b/indra/newview/llperfstats.cpp @@ -131,14 +131,14 @@ namespace LLPerfStats if(gSavedSettings.getBOOL("AutoTuneLock") && !gSavedSettings.getU32("KeepAutoTuneLock")) { - gSavedSettings.setBOOL("AutoTuneLock", FALSE); + gSavedSettings.setBOOL("AutoTuneLock", false); } LLPerfStats::tunables.userAutoTuneEnabled = LLPerfStats::tunables.userAutoTuneLock; if (LLPerfStats::tunables.userAutoTuneEnabled && !gSavedSettings.getBOOL("AutoTuneFPS")) { - gSavedSettings.setBOOL("AutoTuneFPS", TRUE); + gSavedSettings.setBOOL("AutoTuneFPS", true); } // Note: The Max ART slider is logarithmic and thus we have an intermediate proxy value diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index d4811c0828..6799e20de0 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -152,7 +152,7 @@ void LLProgressView::revealIntroPanel() // flag as having seen the new user post login intro - gSavedSettings.setBOOL("PostFirstLoginIntroViewed", TRUE ); + gSavedSettings.setBOOL("PostFirstLoginIntroViewed", true ); mMediaCtrl->setFocus(TRUE); } diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 8d86e2de4c..2655075ad1 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -233,7 +233,7 @@ void LLSceneMonitor::freezeScene() } // freeze everything else - gSavedSettings.setBOOL("FreezeTime", TRUE); + gSavedSettings.setBOOL("FreezeTime", true); //disable sky, water and clouds gPipeline.clearRenderTypeMask(LLPipeline::RENDER_TYPE_SKY, LLPipeline::RENDER_TYPE_WL_SKY, @@ -254,7 +254,7 @@ void LLSceneMonitor::unfreezeScene() } // thaw everything else - gSavedSettings.setBOOL("FreezeTime", FALSE); + gSavedSettings.setBOOL("FreezeTime", false); //enable sky, water and clouds gPipeline.setRenderTypeMask(LLPipeline::RENDER_TYPE_SKY, LLPipeline::RENDER_TYPE_WL_SKY, diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 4c7a440231..7ef05b42e0 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -582,7 +582,7 @@ LLObjectSelectionHandle LLSelectMgr::selectObjectAndFamily(LLViewerObject* obj, // leave component mode if (gSavedSettings.getBOOL("EditLinkedParts")) { - gSavedSettings.setBOOL("EditLinkedParts", FALSE); + gSavedSettings.setBOOL("EditLinkedParts", false); promoteSelectionToRoot(); } @@ -652,7 +652,7 @@ LLObjectSelectionHandle LLSelectMgr::selectObjectAndFamily(const std::vector<LLV // leave component mode if (gSavedSettings.getBOOL("EditLinkedParts")) { - gSavedSettings.setBOOL("EditLinkedParts", FALSE); + gSavedSettings.setBOOL("EditLinkedParts", false); promoteSelectionToRoot(); } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 390890706e..177a89c654 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -703,8 +703,8 @@ bool idle_startup() // Log into last account gRememberPassword = true; gRememberUser = true; - gSavedSettings.setBOOL("RememberPassword", TRUE); - gSavedSettings.setBOOL("RememberUser", TRUE); + gSavedSettings.setBOOL("RememberPassword", true); + gSavedSettings.setBOOL("RememberUser", true); show_connect_box = false; } else if (gSavedSettings.getLLSD("UserLoginInfo").size() == 3) @@ -1173,7 +1173,7 @@ bool idle_startup() general_cert_done); reset_login(); - gSavedSettings.setBOOL("AutoLogin", FALSE); + gSavedSettings.setBOOL("AutoLogin", false); show_connect_box = true; } if(certificate) @@ -1200,7 +1200,7 @@ bool idle_startup() general_cert_done); reset_login(); - gSavedSettings.setBOOL("AutoLogin", FALSE); + gSavedSettings.setBOOL("AutoLogin", false); show_connect_box = true; } @@ -2024,12 +2024,12 @@ bool idle_startup() if (gSavedSettings.getBOOL("ShowHelpOnFirstLogin")) { - gSavedSettings.setBOOL("HelpFloaterOpen", TRUE); + gSavedSettings.setBOOL("HelpFloaterOpen", true); } // Set the show start location to true, now that the user has logged // on with this install. - gSavedSettings.setBOOL("ShowStartLocation", TRUE); + gSavedSettings.setBOOL("ShowStartLocation", true); } display_startup(); @@ -2051,7 +2051,7 @@ bool idle_startup() display_startup(); // We're successfully logged in. - gSavedSettings.setBOOL("FirstLoginThisInstall", FALSE); + gSavedSettings.setBOOL("FirstLoginThisInstall", false); LLFloaterReg::showInitialVisibleInstances(); @@ -3376,8 +3376,8 @@ void trust_cert_done(const LLSD& notification, const LLSD& response) } case OPT_CANCEL_TRUST: reset_login(); - gSavedSettings.setBOOL("AutoLogin", FALSE); - LLStartUp::setStartupState( STATE_LOGIN_SHOW ); + gSavedSettings.setBOOL("AutoLogin", false); + LLStartUp::setStartupState( STATE_LOGIN_SHOW ); default: LLPanelLogin::giveFocus(); break; @@ -3840,6 +3840,6 @@ void transition_back_to_login_panel(const std::string& emsg) { // Bounce back to the login screen. reset_login(); // calls LLStartUp::setStartupState( STATE_LOGIN_SHOW ); - gSavedSettings.setBOOL("AutoLogin", FALSE); + gSavedSettings.setBOOL("AutoLogin", false); } diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp index 43077368b0..e68e2516f4 100644 --- a/indra/newview/lltoolselect.cpp +++ b/indra/newview/lltoolselect.cpp @@ -91,8 +91,8 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi // *NOTE: These settings must be cleaned up at bottom of function. if (temp_select || LLSelectMgr::getInstance()->mAllowSelectAvatar) { - gSavedSettings.setBOOL("SelectOwnedOnly", FALSE); - gSavedSettings.setBOOL("SelectMovableOnly", FALSE); + gSavedSettings.setBOOL("SelectOwnedOnly", false); + gSavedSettings.setBOOL("SelectMovableOnly", false); LLSelectMgr::getInstance()->setForceSelection(TRUE); } diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 9b5719ea1c..bd44801734 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -471,7 +471,7 @@ bool handleHighResSnapshotChanged(const LLSD& newvalue) // High Res Snapshot active, must uncheck RenderUIInSnapshot if (newvalue.asBoolean()) { - gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE ); + gSavedSettings.setBOOL( "RenderUIInSnapshot", false); } return true; } diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index dfa47e82b3..5be3ddad6f 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -234,14 +234,14 @@ void LLViewerJoystick::updateEnabled(bool autoenable) { if (mDriverState == JDS_UNINITIALIZED) { - gSavedSettings.setBOOL("JoystickEnabled", FALSE ); + gSavedSettings.setBOOL("JoystickEnabled", false); } else { // autoenable if user specifically chose this device if (autoenable && (isLikeSpaceNavigator() || isDeviceUUIDSet())) { - gSavedSettings.setBOOL("JoystickEnabled", TRUE ); + gSavedSettings.setBOOL("JoystickEnabled", true ); } } if (!gSavedSettings.getBOOL("JoystickEnabled")) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 90c42ddf0b..f0d5ab43d2 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4467,7 +4467,7 @@ class LLViewDefaultUISize : public view_listener_t bool handleEvent(const LLSD& userdata) { gSavedSettings.setF32("UIScaleFactor", 1.0f); - gSavedSettings.setBOOL("UIAutoScale", FALSE); + gSavedSettings.setBOOL("UIAutoScale", false); gViewerWindow->reshape(gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw()); return true; } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 2a1912890c..5f89fc1311 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1930,7 +1930,7 @@ LLViewerWindow::LLViewerWindow(const Params& p) { gSavedSettings.setF32("UIScaleFactor", 1.f); } - gSavedSettings.setBOOL("ResetUIScaleOnFirstRun", FALSE); + gSavedSettings.setBOOL("ResetUIScaleOnFirstRun", false); } // Get the real window rect the window was created with (since there are various OS-dependent reasons why @@ -1974,7 +1974,7 @@ LLViewerWindow::LLViewerWindow(const Params& p) || (gSavedSettings.getBOOL("ProbeHardwareOnStartup"))) { LLFeatureManager::getInstance()->applyRecommendedSettings(); - gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE); + gSavedSettings.setBOOL("ProbeHardwareOnStartup", false); } // If we crashed while initializng GL stuff last time, disable certain features diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 68d9f4ffab..cc0e913550 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -874,7 +874,7 @@ class LLViewerRequiredVoiceVersion : public LLHTTPNode { //sAlertedUser = TRUE; LLNotificationsUtil::add("VoiceVersionMismatch"); - gSavedSettings.setBOOL("EnableVoiceChat", FALSE); // toggles listener + gSavedSettings.setBOOL("EnableVoiceChat", false); // toggles listener } } } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7f83f17def..fc34af8c72 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -433,8 +433,8 @@ void LLPipeline::init() // disables non-object rendering (UI, sky, water, etc) if (gSavedSettings.getBOOL("RenderPerformanceTest")) { - gSavedSettings.setBOOL("RenderPerformanceTest", FALSE); - gSavedSettings.setBOOL("RenderPerformanceTest", TRUE); + gSavedSettings.setBOOL("RenderPerformanceTest", false); + gSavedSettings.setBOOL("RenderPerformanceTest", true); } mOldRenderDebugMask = mRenderDebugMask; diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index f0479f07b2..e9e9caa9bd 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -198,10 +198,10 @@ LLControlGroup gSavedSettings("Global"); LLControlGroup::LLControlGroup(const std::string& name) : LLInstanceTracker<LLControlGroup, std::string>(name){} LLControlGroup::~LLControlGroup() {} -void LLControlGroup::setBOOL(const std::string& name, BOOL val) {} -BOOL LLControlGroup::getBOOL(const std::string& name) { return FALSE; } +void LLControlGroup::setBOOL(const std::string& name, bool val) {} +bool LLControlGroup::getBOOL(const std::string& name) { return false; } F32 LLControlGroup::getF32(const std::string& name) { return 0.0f; } -U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only) { return 1; } +U32 LLControlGroup::saveToFile(const std::string& filename, bool nondefault_only) { return 1; } void LLControlGroup::setString(const std::string& name, const std::string& val) {} std::string LLControlGroup::getString(const std::string& name) { return "test_string"; } LLControlVariable* LLControlGroup::declareBOOL(const std::string& name, bool initial_val, const std::string& comment, LLControlVariable::ePersist persist) { return NULL; } diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp index da742370fc..b720e60d21 100644 --- a/indra/newview/tests/llsechandler_basic_test.cpp +++ b/indra/newview/tests/llsechandler_basic_test.cpp @@ -90,7 +90,7 @@ std::string LLControlGroup::getString(const std::string& name) } // Stub for --no-verify-ssl-cert -BOOL LLControlGroup::getBOOL(const std::string& name) { return FALSE; } +bool LLControlGroup::getBOOL(const std::string& name) { return false; } LLSD LLCredential::getLoginParams() { |