summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermarketplacelistings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloatermarketplacelistings.cpp')
-rw-r--r--indra/newview/llfloatermarketplacelistings.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 266648bc54..f20fea01c5 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -62,7 +62,7 @@ LLPanelMarketplaceListings::LLPanelMarketplaceListings()
mEnableCallbackRegistrar.add("Marketplace.ViewSort.CheckItem", boost::bind(&LLPanelMarketplaceListings::onViewSortMenuItemCheck, this, _2));
}
-BOOL LLPanelMarketplaceListings::postBuild()
+bool LLPanelMarketplaceListings::postBuild()
{
childSetAction("add_btn", boost::bind(&LLPanelMarketplaceListings::onAddButtonClicked, this));
childSetAction("audit_btn", boost::bind(&LLPanelMarketplaceListings::onAuditButtonClicked, this));
@@ -71,19 +71,19 @@ BOOL LLPanelMarketplaceListings::postBuild()
mFilterEditor->setCommitCallback(boost::bind(&LLPanelMarketplaceListings::onFilterEdit, this, _2));
mAuditBtn = getChild<LLButton>("audit_btn");
- mAuditBtn->setEnabled(FALSE);
+ mAuditBtn->setEnabled(false);
return LLPanel::postBuild();
}
-BOOL LLPanelMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+bool LLPanelMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg)
{
LLView * handled_view = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
- BOOL handled = (handled_view != NULL);
+ bool handled = (handled_view != NULL);
// Special case the drop zone
if (handled && (handled_view->getName() == "marketplace_drop_zone"))
{
@@ -190,7 +190,7 @@ void LLPanelMarketplaceListings::draw()
LLPanel::draw();
}
-void LLPanelMarketplaceListings::onSelectionChange(LLInventoryPanel *panel, const std::deque<LLFolderViewItem*>& items, BOOL user_action)
+void LLPanelMarketplaceListings::onSelectionChange(LLInventoryPanel *panel, const std::deque<LLFolderViewItem*>& items, bool user_action)
{
panel->onSelectionChange(items, user_action);
}
@@ -251,8 +251,8 @@ void LLPanelMarketplaceListings::onAddButtonClicked()
if (panel)
{
gInventory.notifyObservers();
- panel->setSelectionByID(new_cat_id, TRUE);
- panel->getRootFolder()->setNeedsAutoRename(TRUE);
+ panel->setSelectionByID(new_cat_id, true);
+ panel->getRootFolder()->setNeedsAutoRename(true);
}
}
);
@@ -395,7 +395,7 @@ LLFloaterMarketplaceListings::~LLFloaterMarketplaceListings()
delete mCategoryAddedObserver;
}
-BOOL LLFloaterMarketplaceListings::postBuild()
+bool LLFloaterMarketplaceListings::postBuild()
{
mInventoryStatus = getChild<LLTextBox>("marketplace_status");
mInventoryInitializationInProgress = getChild<LLView>("initialization_progress_indicator");
@@ -420,7 +420,7 @@ BOOL LLFloaterMarketplaceListings::postBuild()
}
- return TRUE;
+ return true;
}
void LLFloaterMarketplaceListings::onClose(bool app_quitting)
@@ -577,7 +577,7 @@ S32 LLFloaterMarketplaceListings::getFolderCount()
LLInventoryModel::item_array_t * items;
gInventory.getDirectDescendentsOf(mRootFolderId, cats, items);
- return (cats->size() + items->size());
+ return static_cast<S32>(cats->size() + items->size());
}
else
{
@@ -612,7 +612,7 @@ void LLFloaterMarketplaceListings::updateView()
{
// Just show the loading indicator in that case and fetch the data (fetch will be skipped if it's already loading)
mInventoryInitializationInProgress->setVisible(true);
- mPanelListings->setVisible(FALSE);
+ mPanelListings->setVisible(false);
fetchContents();
return;
}
@@ -629,13 +629,13 @@ void LLFloaterMarketplaceListings::updateView()
// We need to rebuild the tabs cleanly the first time we make them visible
setPanels();
}
- mPanelListings->setVisible(TRUE);
- mInventoryPlaceholder->setVisible(FALSE);
+ mPanelListings->setVisible(true);
+ mInventoryPlaceholder->setVisible(false);
}
else
{
- mPanelListings->setVisible(FALSE);
- mInventoryPlaceholder->setVisible(TRUE);
+ mPanelListings->setVisible(false);
+ mInventoryPlaceholder->setVisible(true);
std::string text;
std::string title;
@@ -704,7 +704,7 @@ bool LLFloaterMarketplaceListings::isAccepted(EAcceptance accept)
return (accept >= ACCEPT_YES_COPY_SINGLE);
}
-BOOL LLFloaterMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+bool LLFloaterMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
@@ -713,14 +713,14 @@ BOOL LLFloaterMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, BO
// If there's no panel to accept drops or no existing marketplace listings folder, we refuse all drop
if (!mPanelListings || mRootFolderId.isNull())
{
- return FALSE;
+ return false;
}
tooltip_msg = "";
// Pass to the children
LLView * handled_view = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
- BOOL handled = (handled_view != NULL);
+ bool handled = (handled_view != NULL);
// If no one handled it or it was not accepted and we drop on an empty panel, we try to accept it at the floater level
// as if it was dropped on the marketplace listings root folder
@@ -737,7 +737,7 @@ BOOL LLFloaterMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, BO
return handled;
}
-BOOL LLFloaterMarketplaceListings::handleHover(S32 x, S32 y, MASK mask)
+bool LLFloaterMarketplaceListings::handleHover(S32 x, S32 y, MASK mask)
{
return LLFloater::handleHover(x, y, mask);
}
@@ -785,9 +785,9 @@ LLFloaterAssociateListing::~LLFloaterAssociateListing()
gFocusMgr.releaseFocusIfNeeded( this );
}
-BOOL LLFloaterAssociateListing::postBuild()
+bool LLFloaterAssociateListing::postBuild()
{
- getChild<LLButton>("OK")->setCommitCallback(boost::bind(&LLFloaterAssociateListing::apply, this, TRUE));
+ getChild<LLButton>("OK")->setCommitCallback(boost::bind(&LLFloaterAssociateListing::apply, this, true));
getChild<LLButton>("Cancel")->setCommitCallback(boost::bind(&LLFloaterAssociateListing::cancel, this));
getChild<LLLineEditor>("listing_id")->setPrevalidate(&LLTextValidate::validateNonNegativeS32);
center();
@@ -795,17 +795,17 @@ BOOL LLFloaterAssociateListing::postBuild()
return LLFloater::postBuild();
}
-BOOL LLFloaterAssociateListing::handleKeyHere(KEY key, MASK mask)
+bool LLFloaterAssociateListing::handleKeyHere(KEY key, MASK mask)
{
if (key == KEY_RETURN && mask == MASK_NONE)
{
apply();
- return TRUE;
+ return true;
}
else if (key == KEY_ESCAPE && mask == MASK_NONE)
{
cancel();
- return TRUE;
+ return true;
}
return LLFloater::handleKeyHere(key, mask);
@@ -827,11 +827,11 @@ void LLFloaterAssociateListing::callback_apply(const LLSD& notification, const L
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0) // YES
{
- apply(FALSE);
+ apply(false);
}
}
-void LLFloaterAssociateListing::apply(BOOL user_confirm)
+void LLFloaterAssociateListing::apply(bool user_confirm)
{
if (mUUID.notNull())
{
@@ -876,17 +876,17 @@ mEditor(NULL)
{
}
-BOOL LLFloaterMarketplaceValidation::postBuild()
+bool LLFloaterMarketplaceValidation::postBuild()
{
childSetAction("OK", onOK, this);
// This widget displays the validation messages
mEditor = getChild<LLTextEditor>("validation_text");
- mEditor->setEnabled(FALSE);
- mEditor->setFocus(TRUE);
+ mEditor->setEnabled(false);
+ mEditor->setFocus(true);
mEditor->setValue(LLSD());
- return TRUE;
+ return true;
}
LLFloaterMarketplaceValidation::~LLFloaterMarketplaceValidation()
@@ -1021,7 +1021,7 @@ LLFloaterItemProperties::~LLFloaterItemProperties()
{
}
-BOOL LLFloaterItemProperties::postBuild()
+bool LLFloaterItemProperties::postBuild()
{
return LLFloater::postBuild();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 07:01:16 +0000