diff options
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 1fbd198019..47d92bc2da 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -83,7 +83,7 @@ private: virtual ~LLFloaterAbout(); public: - /*virtual*/ BOOL postBuild(); + bool postBuild() override; /// Obtain the data used to fill out the contents string. This is /// separated so that we can programmatically access the same info. @@ -122,7 +122,7 @@ LLFloaterAbout::~LLFloaterAbout() { } -BOOL LLFloaterAbout::postBuild() +bool LLFloaterAbout::postBuild() { center(); LLViewerTextEditor *support_widget = @@ -157,7 +157,7 @@ BOOL LLFloaterAbout::postBuild() support_widget->blockUndo(); // Fix views - support_widget->setEnabled(FALSE); + support_widget->setEnabled(false); support_widget->startOfDoc(); // Get the names of contributors, extracted from .../doc/contributions.txt by viewer_manifest.py at build time @@ -175,7 +175,7 @@ BOOL LLFloaterAbout::postBuild() LL_WARNS("AboutInit") << "Could not read contributors file at " << contributors_path << LL_ENDL; } contrib_names_widget->setText(contributors); - contrib_names_widget->setEnabled(FALSE); + contrib_names_widget->setEnabled(false); contrib_names_widget->startOfDoc(); // Get the Versions and Copyrights, created at build time @@ -188,7 +188,7 @@ BOOL LLFloaterAbout::postBuild() licenses_widget->clear(); while ( std::getline(licenses_file, license_line) ) { - licenses_widget->appendText(license_line+"\n", FALSE, + licenses_widget->appendText(license_line+"\n", false, LLStyle::Params() .color(about_color)); } licenses_file.close(); @@ -198,10 +198,10 @@ BOOL LLFloaterAbout::postBuild() // this case will use the (out of date) hard coded value from the XUI LL_INFOS("AboutInit") << "Could not read licenses file at " << licenses_path << LL_ENDL; } - licenses_widget->setEnabled(FALSE); + licenses_widget->setEnabled(false); licenses_widget->startOfDoc(); - return TRUE; + return true; } LLSD LLFloaterAbout::getInfo() @@ -337,7 +337,7 @@ void LLFloaterAbout::setSupportText(const std::string& server_release_notes_url) LLUIColor about_color = LLUIColorTable::instance().getColor("TextFgReadOnlyColor"); support_widget->clear(); support_widget->appendText(LLAppViewer::instance()->getViewerInfoString(), - FALSE, LLStyle::Params() .color(about_color)); + false, LLStyle::Params() .color(about_color)); } //This is bound as a callback in postBuild() @@ -354,11 +354,11 @@ void LLFloaterAbout::setUpdateListener() // => update ready for install //version directory, .done file and either .skip or .next file exists // => update deferred - BOOL downloads = false; + bool downloads = false; std::string downloadDir = ""; - BOOL done = false; - BOOL next = false; - BOOL skip = false; + bool done = false; + bool next = false; + bool skip = false; LLSD info(LLFloaterAbout::getInfo()); std::string version = info["VIEWER_VERSION_STR"].asString(); |