Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index 8a9b2a7ec7..efce55907e 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -72,7 +72,7 @@ LLPanelPlaceInfo::~LLPanelPlaceInfo()
 }
 
 //virtual
-BOOL LLPanelPlaceInfo::postBuild()
+bool LLPanelPlaceInfo::postBuild()
 {
     mTitle = getChild<LLTextBox>("title");
     mCurrentTitle = mTitle->getText();
@@ -92,7 +92,7 @@ BOOL LLPanelPlaceInfo::postBuild()
     mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight();
     mScrollingPanelWidth = mScrollingPanel->getRect().getWidth();
 
-    return TRUE;
+    return true;
 }
 
 //virtual
@@ -194,7 +194,7 @@ void LLPanelPlaceInfo::setErrorStatus(S32 status, const std::string& reason)
     mRegionTitle.clear();
 
     // Enable "Back" button that was disabled when parcel request was sent.
-    getChild<LLButton>("back_btn")->setEnabled(TRUE);
+    getChild<LLButton>("back_btn")->setEnabled(true);
 }
 
 // virtual
@@ -258,11 +258,11 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)
 }
 
 // virtual
-void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent)
+void LLPanelPlaceInfo::reshape(S32 width, S32 height, bool called_from_parent)
 {
 
     // This if was added to force collapsing description textbox on Windows at the beginning of reshape
-    // (the only case when reshape is skipped here is when it's caused by this textbox, so called_from_parent is FALSE)
+    // (the only case when reshape is skipped here is when it's caused by this textbox, so called_from_parent is false)
     // This way it is consistent with Linux where topLost collapses textbox at the beginning of reshape.
     // On windows it collapsed only after reshape which caused EXT-8342.
     if(called_from_parent)