summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAnsariel <ansariel.hiller@phoenixviewer.com>2024-02-21 21:05:14 +0100
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-02-21 23:14:31 +0200
commit60d3dd98a44230c21803c1606552ee098ed9fa7c (patch)
treeaf0aa11c458ca86f786560e0875f7e018e1a16b9 /indra/newview/llstartup.cpp
parent855eea7ddf9e1de9226036ca94ccb03ac0e311b9 (diff)
Convert remaining BOOL to bool
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp136
1 files changed, 68 insertions, 68 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 177a89c654..d2c045669a 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -537,7 +537,7 @@ bool idle_startup()
LLVersionInfo::instance().getMajor(),
LLVersionInfo::instance().getMinor(),
LLVersionInfo::instance().getPatch(),
- FALSE,
+ false,
std::string(),
responder,
failure_is_fatal,
@@ -608,7 +608,7 @@ bool idle_startup()
F32 xfer_throttle_bps = gSavedSettings.getF32("XferThrottle");
if (xfer_throttle_bps > 1.f)
{
- gXferManager->setUseAckThrottling(TRUE);
+ gXferManager->setUseAckThrottling(true);
gXferManager->setAckThrottleBPS(xfer_throttle_bps);
}
gAssetStorage = new LLViewerAssetStorage(msg, gXferManager);
@@ -622,13 +622,13 @@ bool idle_startup()
if (inBandwidth != 0.f)
{
LL_DEBUGS("AppInit") << "Setting packetring incoming bandwidth to " << inBandwidth << LL_ENDL;
- msg->mPacketRing.setUseInThrottle(TRUE);
+ msg->mPacketRing.setUseInThrottle(true);
msg->mPacketRing.setInBandwidth(inBandwidth);
}
if (outBandwidth != 0.f)
{
LL_DEBUGS("AppInit") << "Setting packetring outgoing bandwidth to " << outBandwidth << LL_ENDL;
- msg->mPacketRing.setUseOutThrottle(TRUE);
+ msg->mPacketRing.setUseOutThrottle(true);
msg->mPacketRing.setOutBandwidth(outBandwidth);
}
}
@@ -640,7 +640,7 @@ bool idle_startup()
// or audio cues in connection UI.
//-------------------------------------------------
- if (FALSE == gSavedSettings.getBOOL("NoAudio"))
+ if (false == gSavedSettings.getBOOL("NoAudio"))
{
delete gAudiop;
gAudiop = NULL;
@@ -668,7 +668,7 @@ bool idle_startup()
LL_INFOS("AppInit") << "Using media plugins to render streaming audio" << LL_ENDL;
gAudiop->setStreamingAudioImpl(new LLStreamingAudio_MediaPlugins());
- gAudiop->setMuted(TRUE);
+ gAudiop->setMuted(true);
}
else
{
@@ -696,7 +696,7 @@ bool idle_startup()
// Previous initializeLoginInfo may have generated user credentials. Re-check them.
if (gUserCredential.isNull())
{
- show_connect_box = TRUE;
+ show_connect_box = true;
}
else if (gSavedSettings.getBOOL("AutoLogin"))
{
@@ -718,7 +718,7 @@ bool idle_startup()
{
gRememberPassword = gSavedSettings.getBOOL("RememberPassword");
gRememberUser = gSavedSettings.getBOOL("RememberUser");
- show_connect_box = TRUE;
+ show_connect_box = true;
}
//setup map of datetime strings to codes and slt & local time offset from utc
@@ -727,7 +727,7 @@ bool idle_startup()
// Go to the next startup state
LLStartUp::setStartupState( STATE_BROWSER_INIT );
- return FALSE;
+ return false;
}
@@ -739,7 +739,7 @@ bool idle_startup()
display_startup();
// LLViewerMedia::initBrowser();
LLStartUp::setStartupState( STATE_LOGIN_SHOW );
- return FALSE;
+ return false;
}
@@ -781,7 +781,7 @@ bool idle_startup()
gUserCredential = gLoginHandler.initializeLoginInfo();
}
// Make sure the process dialog doesn't hide things
- gViewerWindow->setShowProgress(FALSE);
+ gViewerWindow->setShowProgress(false);
// Show the login dialog
login_show();
// connect dialog is already shown, so fill in the names
@@ -811,9 +811,9 @@ bool idle_startup()
LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
}
- gViewerWindow->setNormalControlsVisible( FALSE );
- gLoginMenuBarView->setVisible( TRUE );
- gLoginMenuBarView->setEnabled( TRUE );
+ gViewerWindow->setNormalControlsVisible( false );
+ gLoginMenuBarView->setVisible( true );
+ gLoginMenuBarView->setEnabled( true );
show_debug_menus();
// Hide the splash screen
@@ -834,7 +834,7 @@ bool idle_startup()
#endif
display_startup();
timeout.reset();
- return FALSE;
+ return false;
}
if (STATE_LOGIN_WAIT == LLStartUp::getStartupState())
@@ -850,7 +850,7 @@ bool idle_startup()
// display() function will be the one to run display_startup()
// Sleep so we don't spin the CPU
ms_sleep(1);
- return FALSE;
+ return false;
}
if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
@@ -866,7 +866,7 @@ bool idle_startup()
// could then change the preferences to fix the issue.
LLStartUp::setStartupState(STATE_LOGIN_SHOW);
- return FALSE;
+ return false;
}
// reset the values that could have come in from a slurl
@@ -1011,14 +1011,14 @@ bool idle_startup()
// Display the startup progress bar.
gViewerWindow->initTextures(agent_location_id);
- gViewerWindow->setShowProgress(TRUE);
- gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Quit"));
+ gViewerWindow->setShowProgress(true);
+ gViewerWindow->setProgressCancelButtonVisible(true, LLTrans::getString("Quit"));
gViewerWindow->revealIntroPanel();
LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
- return FALSE;
+ return false;
}
if(STATE_LOGIN_AUTH_INIT == LLStartUp::getStartupState())
@@ -1044,7 +1044,7 @@ bool idle_startup()
login->connect(gUserCredential);
LLStartUp::setStartupState( STATE_LOGIN_CURL_UNSTUCK );
- return FALSE;
+ return false;
}
if(STATE_LOGIN_CURL_UNSTUCK == LLStartUp::getStartupState())
@@ -1055,7 +1055,7 @@ bool idle_startup()
set_startup_status(progress, auth_desc, auth_message);
LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE );
- return FALSE;
+ return false;
}
if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState())
@@ -1244,10 +1244,10 @@ bool idle_startup()
LLNotificationsUtil::add("ErrorMessage", args, LLSD(), login_alert_done);
transition_back_to_login_panel(emsg.str());
show_connect_box = true;
- return FALSE;
+ return false;
}
}
- return FALSE;
+ return false;
}
//---------------------------------------------------------------------
@@ -1269,7 +1269,7 @@ bool idle_startup()
// Since we connected, save off the settings so the user doesn't have to
// type the name/password again if we crash.
- gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
+ gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), true);
LLUIColorTable::instance().saveUserSettings();
display_startup();
@@ -1350,7 +1350,7 @@ bool idle_startup()
LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT );
- return FALSE;
+ return false;
}
@@ -1363,7 +1363,7 @@ bool idle_startup()
LLStartUp::multimediaInit();
LLStartUp::setStartupState( STATE_FONT_INIT );
display_startup();
- return FALSE;
+ return false;
}
// Loading fonts takes several seconds
@@ -1372,7 +1372,7 @@ bool idle_startup()
LLStartUp::fontInit();
LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );
display_startup();
- return FALSE;
+ return false;
}
//---------------------------------------------------------------------
@@ -1426,7 +1426,7 @@ bool idle_startup()
}
}
display_startup();
- return FALSE;
+ return false;
}
@@ -1451,10 +1451,10 @@ bool idle_startup()
if ( gViewerWindow != NULL)
{ // This isn't the first logon attempt, so show the UI
- gViewerWindow->setNormalControlsVisible( TRUE );
+ gViewerWindow->setNormalControlsVisible( true );
}
- gLoginMenuBarView->setVisible( FALSE );
- gLoginMenuBarView->setEnabled( FALSE );
+ gLoginMenuBarView->setVisible( false );
+ gLoginMenuBarView->setEnabled( false );
display_startup();
// direct logging to the debug console's line buffer
@@ -1479,7 +1479,7 @@ bool idle_startup()
display_startup();
#ifndef LL_RELEASE_FOR_DOWNLOAD
- gMessageSystem->setTimeDecodes( TRUE ); // Time the decode of each msg
+ gMessageSystem->setTimeDecodes( true ); // Time the decode of each msg
gMessageSystem->setTimeDecodesSpamThreshold( 0.05f ); // Spam if a single msg takes over 50ms to decode
#endif
display_startup();
@@ -1599,7 +1599,7 @@ bool idle_startup()
gUseCircuitCallbackCalled = false;
- msg->enableCircuit(gFirstSim, TRUE);
+ msg->enableCircuit(gFirstSim, true);
// now, use the circuit info to tell simulator about us!
LL_INFOS("AppInit") << "viewer: UserLoginLocationReply() Enabling " << gFirstSim << " with code " << msg->mOurCircuitCode << LL_ENDL;
msg->newMessageFast(_PREHASH_UseCircuitCode);
@@ -1610,7 +1610,7 @@ bool idle_startup()
msg->sendReliable(
gFirstSim,
gSavedSettings.getS32("UseCircuitCodeMaxRetries"),
- FALSE,
+ false,
(F32Seconds)gSavedSettings.getF32("UseCircuitCodeTimeout"),
use_circuit_callback,
NULL);
@@ -1618,7 +1618,7 @@ bool idle_startup()
timeout.reset();
display_startup();
- return FALSE;
+ return false;
}
//---------------------------------------------------------------------
@@ -1633,7 +1633,7 @@ bool idle_startup()
LLStartUp::setStartupState( STATE_AGENT_SEND );
}
pump_idle_startup_network();
- return FALSE;
+ return false;
}
//---------------------------------------------------------------------
@@ -1663,7 +1663,7 @@ bool idle_startup()
// But not on first login, because you can't see your avatar then
if (!gAgent.isFirstLogin())
{
- LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+ LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, true);
effectp->setPositionGlobal(gAgent.getPositionGlobal());
effectp->setColor(LLColor4U(gAgent.getEffectColor()));
LLHUDManager::getInstance()->sendEffects();
@@ -1673,7 +1673,7 @@ bool idle_startup()
timeout.reset();
display_startup();
- return FALSE;
+ return false;
}
//---------------------------------------------------------------------
@@ -1724,7 +1724,7 @@ bool idle_startup()
}
reset_login();
}
- return FALSE;
+ return false;
}
//---------------------------------------------------------------------
@@ -1778,7 +1778,7 @@ bool idle_startup()
display_startup();
LLStartUp::setStartupState(STATE_INVENTORY_SKEL);
display_startup();
- return FALSE;
+ return false;
}
if (STATE_INVENTORY_SKEL == LLStartUp::getStartupState())
@@ -1810,7 +1810,7 @@ bool idle_startup()
display_startup();
LLStartUp::setStartupState(STATE_INVENTORY_SEND2);
display_startup();
- return FALSE;
+ return false;
}
if (STATE_INVENTORY_SEND2 == LLStartUp::getStartupState())
@@ -1890,7 +1890,7 @@ bool idle_startup()
// visible. JC
if (show_hud || gSavedSettings.getBOOL("ShowTutorial"))
{
- LLFloaterReg::showInstance("hud", LLSD(), FALSE);
+ LLFloaterReg::showInstance("hud", LLSD(), false);
}
display_startup();
@@ -1927,7 +1927,7 @@ bool idle_startup()
LLStartUp::setStartupState(STATE_INVENTORY_CALLBACKS );
display_startup();
- return FALSE;
+ return false;
}
//---------------------------------------------------------------------
@@ -1938,7 +1938,7 @@ bool idle_startup()
if (!LLInventoryModel::isSysFoldersReady())
{
display_startup();
- return FALSE;
+ return false;
}
LLInventoryModelBackgroundFetch::instance().start();
LLUUID cof_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
@@ -1984,7 +1984,7 @@ bool idle_startup()
LLStartUp::setStartupState( STATE_MISC );
display_startup();
- return FALSE;
+ return false;
}
@@ -2085,8 +2085,8 @@ bool idle_startup()
if (item_id.notNull() && asset_id.notNull())
{
// Could schedule and delay these for later.
- const BOOL no_inform_server = FALSE;
- const BOOL no_deactivate_similar = FALSE;
+ const bool no_inform_server = false;
+ const bool no_deactivate_similar = false;
LLGestureMgr::instance().activateGestureWithAsset(item_id, asset_id,
no_inform_server,
no_deactivate_similar);
@@ -2099,7 +2099,7 @@ bool idle_startup()
LLGestureMgr::instance().setFetchIDs(item_ids);
LLGestureMgr::instance().startFetch();
}
- gDisplaySwapBuffers = TRUE;
+ gDisplaySwapBuffers = true;
display_startup();
LLMessageSystem* msg = gMessageSystem;
@@ -2142,13 +2142,13 @@ bool idle_startup()
&& gSavedSettings.getBOOL("RestoreCameraPosOnLogin"))
{
// restore old camera pos
- gAgentCamera.setFocusOnAvatar(FALSE, FALSE);
+ gAgentCamera.setFocusOnAvatar(false, false);
gAgentCamera.setCameraPosAndFocusGlobal(gSavedSettings.getVector3d("CameraPosOnLogout"), gSavedSettings.getVector3d("FocusPosOnLogout"), LLUUID::null);
- BOOL limit_hit = FALSE;
+ bool limit_hit = false;
gAgentCamera.calcCameraPositionTargetGlobal(&limit_hit);
if (limit_hit)
{
- gAgentCamera.setFocusOnAvatar(TRUE, FALSE);
+ gAgentCamera.setFocusOnAvatar(true, false);
}
gAgentCamera.stopCameraAnimation();
}
@@ -2185,7 +2185,7 @@ bool idle_startup()
LLStartUp::setStartupState( STATE_PRECACHE );
timeout.reset();
- return FALSE;
+ return false;
}
if (STATE_PRECACHE == LLStartUp::getStartupState())
@@ -2211,7 +2211,7 @@ bool idle_startup()
if (isAgentAvatarValid() && !gAgent.isFirstLogin() && !gAgent.isOutfitChosen())
{
gAgentWearables.notifyLoadingStarted();
- gAgent.setOutfitChosen(TRUE);
+ gAgent.setOutfitChosen(true);
gAgentWearables.sendDummyAgentWearablesUpdate();
callAfterCOFFetch(set_flags_and_update_appearance);
}
@@ -2244,7 +2244,7 @@ bool idle_startup()
display_startup();
}
- return TRUE;
+ return true;
}
if (STATE_WEARABLES_WAIT == LLStartUp::getStartupState())
@@ -2290,7 +2290,7 @@ bool idle_startup()
{
LL_DEBUGS("Avatar") << "avatar fully loaded" << LL_ENDL;
LLStartUp::setStartupState( STATE_CLEANUP );
- return TRUE;
+ return true;
}
}
else
@@ -2301,7 +2301,7 @@ bool idle_startup()
// We have our clothing, proceed.
LL_DEBUGS("Avatar") << "wearables loaded" << LL_ENDL;
LLStartUp::setStartupState( STATE_CLEANUP );
- return TRUE;
+ return true;
}
}
//fall through this frame to STATE_CLEANUP
@@ -2330,7 +2330,7 @@ bool idle_startup()
LL_DEBUGS("AppInit") << "Done releasing bitmap" << LL_ENDL;
//gViewerWindow->revealIntroPanel();
gViewerWindow->setStartupComplete();
- gViewerWindow->setProgressCancelButtonVisible(FALSE);
+ gViewerWindow->setProgressCancelButtonVisible(false);
display_startup();
// We're not away from keyboard, even though login might have taken
@@ -2398,10 +2398,10 @@ bool idle_startup()
LLPerfStats::StatsRecorder::setAutotuneInit();
- return TRUE;
+ return true;
}
- return TRUE;
+ return true;
}
//
@@ -2415,7 +2415,7 @@ void login_show()
// Hide the toolbars: may happen to come back here if login fails after login agent but before login in region
if (gToolBarView)
{
- gToolBarView->setVisible(FALSE);
+ gToolBarView->setVisible(false);
}
LLPanelLogin::show( gViewerWindow->getWindowRectScaled(), login_callback, NULL );
@@ -2437,7 +2437,7 @@ void login_callback(S32 option, void *userdata)
if (!gSavedSettings.getBOOL("RememberPassword"))
{
// turn off the setting and write out to disk
- gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
+ gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , true );
LLUIColorTable::instance().saveUserSettings();
}
@@ -2889,7 +2889,7 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
LL_DEBUGS() << "initial outfit category id: " << cat_id << LL_ENDL;
}
- gAgent.setOutfitChosen(TRUE);
+ gAgent.setOutfitChosen(true);
gAgentWearables.sendDummyAgentWearablesUpdate();
}
@@ -2984,9 +2984,9 @@ void reset_login()
if ( gViewerWindow )
{ // Hide menus and normal buttons
- gViewerWindow->setNormalControlsVisible( FALSE );
- gLoginMenuBarView->setVisible( TRUE );
- gLoginMenuBarView->setEnabled( TRUE );
+ gViewerWindow->setNormalControlsVisible( false );
+ gLoginMenuBarView->setVisible( true );
+ gLoginMenuBarView->setEnabled( true );
}
// Hide any other stuff
@@ -3595,7 +3595,7 @@ bool process_login_success_response()
gFirstSim.set(sim_ip_str, sim_port);
if (gFirstSim.isOk())
{
- gMessageSystem->enableCircuit(gFirstSim, TRUE);
+ gMessageSystem->enableCircuit(gFirstSim, true);
}
}
std::string region_x_str = response["region_x"];
@@ -3694,7 +3694,7 @@ bool process_login_success_response()
// outfit is chosen on COF contents, initial outfit
// requested and available, etc.
- //gAgent.setGenderChosen(TRUE);
+ //gAgent.setGenderChosen(true);
}
bool pacific_daylight_time = false;