summaryrefslogtreecommitdiff
path: root/indra/newview/llgrouplist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
-rw-r--r--indra/newview/llgrouplist.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index 0f4ff2aac8..14ac14cd85 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)
{
@@ -223,7 +223,7 @@ void LLGroupList::refresh()
if (mForAgent)
{
const LLUUID& highlight_id = gAgent.getGroupID();
- S32 count = gAgent.mGroups.size();
+ S32 count = static_cast<S32>(gAgent.mGroups.size());
LLUUID id;
bool have_filter = !mNameFilter.empty();
@@ -426,7 +426,7 @@ LLGroupListItem::~LLGroupListItem()
}
//virtual
-BOOL LLGroupListItem::postBuild()
+bool LLGroupListItem::postBuild()
{
mGroupIcon = getChild<LLGroupIconCtrl>("group_icon");
mGroupNameBox = getChild<LLTextBox>("group_name");
@@ -457,7 +457,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
@@ -482,9 +482,9 @@ void LLGroupListItem::onMouseEnter(S32 x, S32 y, MASK mask)
{
if (mVisibilityHideBtn)
{
- mVisibilityHideBtn->setVisible(agent_gdatap.mListInProfile);
- mVisibilityShowBtn->setVisible(!agent_gdatap.mListInProfile);
- }
+ mVisibilityHideBtn->setVisible(agent_gdatap.mListInProfile);
+ mVisibilityShowBtn->setVisible(!agent_gdatap.mListInProfile);
+ }
mNoticesBtn->setVisible(true);
}
}
@@ -544,7 +544,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.