diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llgrouplist.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
| -rw-r--r-- | indra/newview/llgrouplist.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index 32af2592d3..f060cdf906 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -163,9 +163,9 @@ void LLGroupList::draw() } // virtual -BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask) +bool LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask) { - BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask); + bool handled = LLUICtrl::handleRightMouseDown(x, y, mask); if (mForAgent) { @@ -182,9 +182,9 @@ BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask) } // virtual -BOOL LLGroupList::handleDoubleClick(S32 x, S32 y, MASK mask) +bool LLGroupList::handleDoubleClick(S32 x, S32 y, MASK mask) { - BOOL handled = LLView::handleDoubleClick(x, y, mask); + bool handled = LLView::handleDoubleClick(x, y, mask); // Handle double click only for the selected item in the list, skip clicks on empty space. if (handled) { @@ -424,7 +424,7 @@ LLGroupListItem::~LLGroupListItem() } //virtual -BOOL LLGroupListItem::postBuild() +bool LLGroupListItem::postBuild() { mGroupIcon = getChild<LLGroupIconCtrl>("group_icon"); mGroupNameBox = getChild<LLTextBox>("group_name"); @@ -452,7 +452,7 @@ BOOL LLGroupListItem::postBuild() // have icons of different sizes so we need to figure it per file. mIconWidth = mGroupNameBox->getRect().mLeft - mGroupIcon->getRect().mLeft; - return TRUE; + return true; } //virtual @@ -534,7 +534,7 @@ void LLGroupListItem::setGroupIconID(const LLUUID& group_icon_id) void LLGroupListItem::setGroupIconVisible(bool visible) { // Already done? Then do nothing. - if (mGroupIcon->getVisible() == (BOOL)visible) + if (mGroupIcon->getVisible() == (bool)visible) return; // Show/hide the group icon. |