summaryrefslogtreecommitdiff
path: root/indra/newview/llnamelistctrl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
-rw-r--r--indra/newview/llnamelistctrl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 034ba38f8d..e0e9d50d49 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -45,7 +45,7 @@
static LLDefaultChildRegistry::Register<LLNameListCtrl> r("name_list");
-static const S32 info_icon_size = 16;
+static constexpr S32 info_icon_size = 16;
void LLNameListCtrl::NameTypeNames::declareValues()
{
@@ -87,19 +87,19 @@ LLScrollListItem* LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPositi
}
// virtual, public
-BOOL LLNameListCtrl::handleDragAndDrop(
+bool LLNameListCtrl::handleDragAndDrop(
S32 x, S32 y, MASK mask,
- BOOL drop,
+ bool drop,
EDragAndDropType cargo_type, void *cargo_data,
EAcceptance *accept,
std::string& tooltip_msg)
{
if (!mAllowCallingCardDrop)
{
- return FALSE;
+ return false;
}
- BOOL handled = FALSE;
+ bool handled = false;
if (cargo_type == DAD_CALLINGCARD)
{
@@ -128,7 +128,7 @@ BOOL LLNameListCtrl::handleDragAndDrop(
}
}
- handled = TRUE;
+ handled = true;
LL_DEBUGS("UserInput") << "dragAndDrop handled by LLNameListCtrl " << getName() << LL_ENDL;
return handled;