summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaces.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
-rw-r--r--indra/newview/llpanelplaces.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 67aa51e38a..7deb1d9fd4 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -108,7 +108,7 @@ public:
}
LLUUID parcel_id;
- if (!parcel_id.set(params[0], FALSE))
+ if (!parcel_id.set(params[0], false))
{
return false;
}
@@ -275,7 +275,7 @@ LLPanelPlaces::~LLPanelPlaces()
}
}
-BOOL LLPanelPlaces::postBuild()
+bool LLPanelPlaces::postBuild()
{
mTeleportBtn = getChild<LLButton>("teleport_btn");
mTeleportBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onTeleportButtonClicked, this));
@@ -309,7 +309,7 @@ BOOL LLPanelPlaces::postBuild()
LLDragAndDropButton* trash_btn = (LLDragAndDropButton*)mRemoveSelectedBtn;
trash_btn->setDragAndDropHandler(boost::bind(&LLPanelPlaces::handleDragAndDropToTrash, this
- , _4 // BOOL drop
+ , _4 // bool drop
, _5 // EDragAndDropType cargo_type
, _6 // void* cargo_data
, _7 // EAcceptance* accept
@@ -323,7 +323,7 @@ BOOL LLPanelPlaces::postBuild()
mPlaceMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_place.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
if (mPlaceMenu)
{
- mPlaceMenu->setAlwaysShowMenu(TRUE);
+ mPlaceMenu->setAlwaysShowMenu(true);
}
else
{
@@ -343,7 +343,7 @@ BOOL LLPanelPlaces::postBuild()
}
mButtonsContainer = getChild<LLPanel>("button_layout_panel");
- mButtonsContainer->setVisible(FALSE);
+ mButtonsContainer->setVisible(false);
mFilterContainer = getChild<LLLayoutStack>("top_menu_panel");
mFilterEditor = getChild<LLFilterEditor>("Filter");
@@ -360,7 +360,7 @@ BOOL LLPanelPlaces::postBuild()
mPlaceProfile = findChild<LLPanelPlaceProfile>("panel_place_profile");
mLandmarkInfo = findChild<LLPanelLandmarkInfo>("panel_landmark_info");
if (!mPlaceProfile || !mLandmarkInfo)
- return FALSE;
+ return false;
mPlaceProfileBackBtn = mPlaceProfile->getChild<LLButton>("back_btn");
mPlaceProfileBackBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onBackButtonClicked, this));
@@ -382,7 +382,7 @@ BOOL LLPanelPlaces::postBuild()
createTabs();
updateVerbs();
- return TRUE;
+ return true;
}
void LLPanelPlaces::onOpen(const LLSD& key)
@@ -403,9 +403,9 @@ void LLPanelPlaces::onOpen(const LLSD& key)
// The second toggle forces the list to be set to Landmark.
// This avoids extracting and duplicating all the state logic from togglePlaceInfoPanel()
// here or some specific private method
- togglePlaceInfoPanel(FALSE);
+ togglePlaceInfoPanel(false);
mPlaceInfoType = key_type;
- togglePlaceInfoPanel(FALSE);
+ togglePlaceInfoPanel(false);
// Update the active tab
onTabSelected();
// Update the buttons at the bottom of the panel
@@ -435,7 +435,7 @@ void LLPanelPlaces::onOpen(const LLSD& key)
mPosGlobal.setZero();
mItem = NULL;
mRegionId.setNull();
- togglePlaceInfoPanel(TRUE);
+ togglePlaceInfoPanel(true);
if (mPlaceInfoType == AGENT_INFO_TYPE)
{
@@ -463,7 +463,7 @@ void LLPanelPlaces::onOpen(const LLSD& key)
mLandmarkInfo->displayParcelInfo(LLUUID(), mPosGlobal);
- mSaveBtn->setEnabled(FALSE);
+ mSaveBtn->setEnabled(false);
}
else if (mPlaceInfoType == LANDMARK_INFO_TYPE)
{
@@ -474,7 +474,7 @@ void LLPanelPlaces::onOpen(const LLSD& key)
if (!item)
return;
- BOOL is_editable = gInventory.isObjectDescendentOf(id, gInventory.getRootFolderID())
+ bool is_editable = gInventory.isObjectDescendentOf(id, gInventory.getRootFolderID())
&& item->getPermissions().allowModifyBy(gAgent.getID());
mLandmarkInfo->setCanEdit(is_editable);
@@ -574,7 +574,7 @@ void LLPanelPlaces::setItem(LLInventoryItem* item)
}
// Check if item is in agent's inventory and he has the permission to modify it.
- BOOL is_landmark_editable = gInventory.isObjectDescendentOf(mItem->getUUID(), gInventory.getRootFolderID()) &&
+ bool is_landmark_editable = gInventory.isObjectDescendentOf(mItem->getUUID(), gInventory.getRootFolderID()) &&
mItem->getPermissions().allowModifyBy(gAgent.getID());
mSaveBtn->setEnabled(is_landmark_editable);
@@ -663,7 +663,7 @@ void LLPanelPlaces::onTabSelected()
childSetVisible("add_btn_panel", supports_create);
// favorites and inventory can remove items, history can clear history
- childSetVisible("trash_btn_panel", TRUE);
+ childSetVisible("trash_btn_panel", true);
if (supports_create)
{
@@ -784,7 +784,7 @@ void LLPanelPlaces::onEditButtonClicked()
isLandmarkEditModeOn = true;
- mLandmarkInfo->toggleLandmarkEditMode(TRUE);
+ mLandmarkInfo->toggleLandmarkEditMode(true);
updateVerbs();
}
@@ -831,7 +831,7 @@ void LLPanelPlaces::onSaveButtonClicked()
gInventory.accountForUpdate(update);
new_item->setParent(folder_id);
- new_item->updateParentOnServer(FALSE);
+ new_item->updateParentOnServer(false);
}
gInventory.updateItem(new_item);
@@ -851,7 +851,7 @@ void LLPanelPlaces::onCancelButtonClicked()
}
else
{
- mLandmarkInfo->toggleLandmarkEditMode(FALSE);
+ mLandmarkInfo->toggleLandmarkEditMode(false);
isLandmarkEditModeOn = false;
updateVerbs();
@@ -898,7 +898,7 @@ void LLPanelPlaces::onOverflowButtonClicked()
{
menu = mLandmarkMenu;
- BOOL is_landmark_removable = FALSE;
+ bool is_landmark_removable = false;
if (mItem.notNull())
{
const LLUUID& item_id = mItem->getUUID();
@@ -978,7 +978,7 @@ void LLPanelPlaces::onOverflowMenuItemClicked(const LLSD& param)
void LLPanelPlaces::onBackButtonClicked()
{
- togglePlaceInfoPanel(FALSE);
+ togglePlaceInfoPanel(false);
// Resetting mPlaceInfoType when Place Info panel is closed.
mPlaceInfoType = LLStringUtil::null;
@@ -1023,7 +1023,7 @@ void LLPanelPlaces::onRemoveButtonClicked()
}
}
-bool LLPanelPlaces::handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept)
+bool LLPanelPlaces::handleDragAndDropToTrash(bool drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept)
{
if (mActivePanel)
{
@@ -1032,7 +1032,7 @@ bool LLPanelPlaces::handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_t
return false;
}
-void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
+void LLPanelPlaces::togglePlaceInfoPanel(bool visible)
{
if (!mPlaceProfile || !mLandmarkInfo)
return;
@@ -1055,7 +1055,7 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
// to avoid text blinking.
mResetInfoTimer.setTimerExpirySec(PLACE_INFO_UPDATE_INTERVAL);
- mLandmarkInfo->setVisible(FALSE);
+ mLandmarkInfo->setVisible(false);
}
else if (mPlaceInfoType == AGENT_INFO_TYPE)
{
@@ -1071,7 +1071,7 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
mPlaceInfoType == LANDMARK_TAB_INFO_TYPE)
{
mLandmarkInfo->setVisible(visible);
- mPlaceProfile->setVisible(FALSE);
+ mPlaceProfile->setVisible(false);
if (visible)
{
mLandmarkInfo->resetLocation();
@@ -1095,7 +1095,7 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
mTabContainer->selectTabPanel(landmarks_panel);
if (mItem.notNull())
{
- landmarks_panel->setItemSelected(mItem->getUUID(), TRUE);
+ landmarks_panel->setItemSelected(mItem->getUUID(), true);
}
else
{
@@ -1107,7 +1107,7 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
}
// virtual
-void LLPanelPlaces::onVisibilityChange(BOOL new_visibility)
+void LLPanelPlaces::onVisibilityChange(bool new_visibility)
{
LLPanel::onVisibilityChange(new_visibility);
@@ -1213,7 +1213,7 @@ void LLPanelPlaces::createTabs()
childSetVisible("add_btn_panel", supports_create);
// favorites and inventory can remove items, history can clear history
- childSetVisible("trash_btn_panel", TRUE);
+ childSetVisible("trash_btn_panel", true);
if (supports_create)
{