Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 33 insertions, 33 deletions

diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index 0966eaa1bf..eb4976fc9e 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -140,7 +140,7 @@ LLFloaterExperienceProfile::~LLFloaterExperienceProfile()
 
 }
 
-BOOL LLFloaterExperienceProfile::postBuild()
+bool LLFloaterExperienceProfile::postBuild()
 {
 
     if (mExperienceId.notNull())
@@ -178,7 +178,7 @@ BOOL LLFloaterExperienceProfile::postBuild()
 
     childSetCommitCallback(EDIT IMG_LOGO, boost::bind(&LLFloaterExperienceProfile::onFieldChanged, this), NULL);
 
-    getChild<LLTextEditor>(EDIT TF_DESC)->setCommitOnFocusLost(TRUE);
+    getChild<LLTextEditor>(EDIT TF_DESC)->setCommitOnFocusLost(true);
 
 
     LLEventPumps::instance().obtain("experience_permission").listen(mExperienceId.asString()+"-profile",
@@ -190,7 +190,7 @@ BOOL LLFloaterExperienceProfile::postBuild()
         changeToEdit();
     }
 
-    return TRUE;
+    return true;
 }
 
 void LLFloaterExperienceProfile::experienceCallback(LLHandle<LLFloaterExperienceProfile> handle,  const LLSD& experience )
@@ -314,11 +314,11 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
     LLLayoutPanel* topPanel = getChild<LLLayoutPanel>(PNL_TOP);
 
 
-    imagePanel->setVisible(FALSE);
-    descriptionPanel->setVisible(FALSE);
-    locationPanel->setVisible(FALSE);
-    marketplacePanel->setVisible(FALSE);
-    topPanel->setVisible(FALSE);
+    imagePanel->setVisible(false);
+    descriptionPanel->setVisible(false);
+    locationPanel->setVisible(false);
+    marketplacePanel->setVisible(false);
+    topPanel->setVisible(false);
 
 
     LLTextBox* child = getChild<LLTextBox>(TF_NAME);
@@ -380,9 +380,9 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
     enable = getChild<LLCheckBoxCtrl>(EDIT BTN_PRIVATE);
     enable->set(properties & LLExperienceCache::PROPERTY_PRIVATE);
 
-    topPanel->setVisible(TRUE);
+    topPanel->setVisible(true);
     child=getChild<LLTextBox>(TF_GRID_WIDE);
-    child->setVisible(TRUE);
+    child->setVisible(true);
 
     if(properties & LLExperienceCache::PROPERTY_GRID)
     {
@@ -395,13 +395,13 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
 
     if(getChild<LLButton>(BTN_EDIT)->getVisible())
     {
-        topPanel->setVisible(TRUE);
+        topPanel->setVisible(true);
     }
 
     if(properties & LLExperienceCache::PROPERTY_PRIVILEGED)
     {
         child = getChild<LLTextBox>(TF_PRIVILEGED);
-        child->setVisible(TRUE);
+        child->setVisible(true);
     }
     else
     {
@@ -433,16 +433,16 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
             child->setText(value);
             if(value.size())
             {
-                marketplacePanel->setVisible(TRUE);
+                marketplacePanel->setVisible(true);
             }
             else
             {
-                marketplacePanel->setVisible(FALSE);
+                marketplacePanel->setVisible(false);
             }
         }
         else
         {
-            marketplacePanel->setVisible(FALSE);
+            marketplacePanel->setVisible(false);
         }
 
         linechild = getChild<LLLineEditor>(EDIT TF_MRKT);
@@ -454,7 +454,7 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
 
             LLUUID id = data[IMG_LOGO].asUUID();
             logo->setImageAssetID(id);
-            imagePanel->setVisible(TRUE);
+            imagePanel->setVisible(true);
 
             logo = getChild<LLTextureCtrl>(EDIT IMG_LOGO);
             logo->setImageAssetID(data[IMG_LOGO].asUUID());
@@ -464,8 +464,8 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
     }
     else
     {
-        marketplacePanel->setVisible(FALSE);
-        imagePanel->setVisible(FALSE);
+        marketplacePanel->setVisible(false);
+        imagePanel->setVisible(false);
     }
 
     mDirty=false;
@@ -533,17 +533,17 @@ void LLFloaterExperienceProfile::onFieldChanged()
 }
 
 
-BOOL LLFloaterExperienceProfile::canClose()
+bool LLFloaterExperienceProfile::canClose()
 {
     if(mForceClose || !mDirty)
     {
-        return TRUE;
+        return true;
     }
     else
     {
         // Bring up view-modal dialog: Save changes? Yes, No, Cancel
         LLNotificationsUtil::add("SaveChanges", LLSD(), LLSD(), boost::bind(&LLFloaterExperienceProfile::handleSaveChangesDialog, this, _1, _2, CLOSE));
-        return FALSE;
+        return false;
     }
 }
 
@@ -560,7 +560,7 @@ bool LLFloaterExperienceProfile::handleSaveChangesDialog( const LLSD& notificati
     case 1:  // "No"
         if(action != NOTHING)
         {
-            mForceClose = TRUE;
+            mForceClose = true;
             if(action==CLOSE)
             {
                 closeFloater();
@@ -738,37 +738,37 @@ void LLFloaterExperienceProfile::updatePermission( const LLSD& permission )
 void LLFloaterExperienceProfile::experienceAllowed()
 {
     LLButton* button=getChild<LLButton>(BTN_ALLOW);
-    button->setEnabled(FALSE);
+    button->setEnabled(false);
 
     button=getChild<LLButton>(BTN_FORGET);
-    button->setEnabled(TRUE);
+    button->setEnabled(true);
 
     button=getChild<LLButton>(BTN_BLOCK);
-    button->setEnabled(TRUE);
+    button->setEnabled(true);
 }
 
 void LLFloaterExperienceProfile::experienceForgotten()
 {
     LLButton* button=getChild<LLButton>(BTN_ALLOW);
-    button->setEnabled(TRUE);
+    button->setEnabled(true);
 
     button=getChild<LLButton>(BTN_FORGET);
-    button->setEnabled(FALSE);
+    button->setEnabled(false);
 
     button=getChild<LLButton>(BTN_BLOCK);
-    button->setEnabled(TRUE);
+    button->setEnabled(true);
 }
 
 void LLFloaterExperienceProfile::experienceBlocked()
 {
     LLButton* button=getChild<LLButton>(BTN_ALLOW);
-    button->setEnabled(TRUE);
+    button->setEnabled(true);
 
     button=getChild<LLButton>(BTN_FORGET);
-    button->setEnabled(TRUE);
+    button->setEnabled(true);
 
     button=getChild<LLButton>(BTN_BLOCK);
-    button->setEnabled(FALSE);
+    button->setEnabled(false);
 }
 
 void LLFloaterExperienceProfile::onClose( bool app_quitting )
@@ -918,8 +918,8 @@ void LLFloaterExperienceProfile::experienceIsAdmin(LLHandle<LLFloaterExperienceP
     }
     if (enabled && result["status"].asBoolean())
     {
-        parent->getChild<LLLayoutPanel>(PNL_TOP)->setVisible(TRUE);
-        parent->getChild<LLButton>(BTN_EDIT)->setVisible(TRUE);
+        parent->getChild<LLLayoutPanel>(PNL_TOP)->setVisible(true);
+        parent->getChild<LLButton>(BTN_EDIT)->setVisible(true);
     }
 }