summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r--indra/newview/llpanellandmarks.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index d573660668..91d4a885f9 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -66,7 +66,7 @@ static void collapse_all_folders(LLFolderView* root_folder);
static void expand_all_folders(LLFolderView* root_folder);
static bool has_expanded_folders(LLFolderView* root_folder);
static bool has_collapsed_folders(LLFolderView* root_folder);
-static void toggle_restore_menu(LLMenuGL* menu, BOOL visible, BOOL enabled);
+static void toggle_restore_menu(LLMenuGL* menu, bool visible, bool enabled);
/**
* Functor counting expanded and collapsed folders in folder view tree to know
@@ -136,7 +136,7 @@ void LLOpenFolderByID::doFolder(LLFolderViewFolder* folder)
{
if (!folder->isOpen())
{
- folder->setOpen(TRUE);
+ folder->setOpen(true);
mIsFolderOpen = true;
}
}
@@ -178,7 +178,7 @@ LLLandmarksPanel::~LLLandmarksPanel()
bool LLLandmarksPanel::postBuild()
{
if (!gInventory.isInventoryUsable())
- return FALSE;
+ return false;
// mast be called before any other initXXX methods to init Gear menu
initListCommandsHandlers();
@@ -292,7 +292,7 @@ void LLLandmarksPanel::updateVerbs()
}
}
-void LLLandmarksPanel::setItemSelected(const LLUUID& obj_id, BOOL take_keyboard_focus)
+void LLLandmarksPanel::setItemSelected(const LLUUID& obj_id, bool take_keyboard_focus)
{
if (!mCurrentSelectedList)
return;
@@ -301,7 +301,7 @@ void LLLandmarksPanel::setItemSelected(const LLUUID& obj_id, BOOL take_keyboard_
LLFolderViewItem* item = mCurrentSelectedList->getItemByID(obj_id);
if (!item)
return;
- root->setSelection(item, FALSE, take_keyboard_focus);
+ root->setSelection(item, false, take_keyboard_focus);
root->scrollToShowSelection();
}
@@ -473,18 +473,18 @@ void LLLandmarksPanel::initListCommandsHandlers()
{
mGearLandmarkMenu->setVisibilityChangeCallback(boost::bind(&LLLandmarksPanel::onMenuVisibilityChange, this, _1, _2));
// show menus even if all items are disabled
- mGearLandmarkMenu->setAlwaysShowMenu(TRUE);
+ mGearLandmarkMenu->setAlwaysShowMenu(true);
} // Else corrupted files?
if (mGearFolderMenu)
{
mGearFolderMenu->setVisibilityChangeCallback(boost::bind(&LLLandmarksPanel::onMenuVisibilityChange, this, _1, _2));
- mGearFolderMenu->setAlwaysShowMenu(TRUE);
+ mGearFolderMenu->setAlwaysShowMenu(true);
}
if (mAddMenu)
{
- mAddMenu->setAlwaysShowMenu(TRUE);
+ mAddMenu->setAlwaysShowMenu(true);
}
}
@@ -887,8 +887,8 @@ void LLLandmarksPanel::onMenuVisibilityChange(LLUICtrl* ctrl, const LLSD& param)
// We don't have to update items visibility if the menu is hiding.
if (!new_visibility) return;
- BOOL are_any_items_in_trash = FALSE;
- BOOL are_all_items_in_trash = TRUE;
+ bool are_any_items_in_trash = false;
+ bool are_all_items_in_trash = true;
LLFolderView* root_folder_view = mCurrentSelectedList ? mCurrentSelectedList->getRootFolder() : NULL;
if(root_folder_view)
@@ -1004,7 +1004,7 @@ bool LLLandmarksPanel::canItemBeModified(const std::string& command_name, LLFold
return can_be_modified;
}
-bool LLLandmarksPanel::handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, void* cargo_data , EAcceptance* accept)
+bool LLLandmarksPanel::handleDragAndDropToTrash(bool drop, EDragAndDropType cargo_type, void* cargo_data , EAcceptance* accept)
{
*accept = ACCEPT_NO;
@@ -1062,7 +1062,7 @@ void LLLandmarksPanel::doShowOnMap(LLLandmark* landmark)
if (mGearLandmarkMenu)
{
- mGearLandmarkMenu->setItemEnabled("show_on_map", TRUE);
+ mGearLandmarkMenu->setItemEnabled("show_on_map", true);
}
}
@@ -1151,7 +1151,7 @@ static void collapse_all_folders(LLFolderView* root_folder)
if (!root_folder)
return;
- root_folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN);
+ root_folder->setOpenArrangeRecursively(false, LLFolderViewFolder::RECURSE_DOWN);
root_folder->arrangeAll();
}
@@ -1160,7 +1160,7 @@ static void expand_all_folders(LLFolderView* root_folder)
if (!root_folder)
return;
- root_folder->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN);
+ root_folder->setOpenArrangeRecursively(true, LLFolderViewFolder::RECURSE_DOWN);
root_folder->arrangeAll();
}
@@ -1195,7 +1195,7 @@ static bool has_collapsed_folders(LLFolderView* root_folder)
// Displays "Restore Item" context menu entry while hiding
// all other entries or vice versa.
// Sets "Restore Item" enabled state.
-void toggle_restore_menu(LLMenuGL *menu, BOOL visible, BOOL enabled)
+void toggle_restore_menu(LLMenuGL *menu, bool visible, bool enabled)
{
if (!menu) return;