summaryrefslogtreecommitdiff
path: root/indra/newview/llblocklist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llblocklist.cpp')
-rw-r--r--indra/newview/llblocklist.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llblocklist.cpp b/indra/newview/llblocklist.cpp
index 31b83cfb57..89516a8a84 100644
--- a/indra/newview/llblocklist.cpp
+++ b/indra/newview/llblocklist.cpp
@@ -47,7 +47,7 @@ LLBlockList::LLBlockList(const Params& p)
{
LLMuteList::getInstance()->addObserver(this);
- mMuteListSize = LLMuteList::getInstance()->getMutes().size();
+ mMuteListSize = static_cast<U32>(LLMuteList::getInstance()->getMutes().size());
// Set up context menu.
LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
@@ -92,7 +92,7 @@ void LLBlockList::createList()
BlockListActionType LLBlockList::getCurrentMuteListActionType()
{
BlockListActionType type = NONE;
- U32 curSize = LLMuteList::getInstance()->getMutes().size();
+ U32 curSize = static_cast<U32>(LLMuteList::getInstance()->getMutes().size());
if( curSize > mMuteListSize)
type = ADD;
else if(curSize < mMuteListSize)
@@ -113,9 +113,9 @@ void LLBlockList::onChangeDetailed(const LLMute &mute)
refresh();
}
-BOOL LLBlockList::handleRightMouseDown(S32 x, S32 y, MASK mask)
+bool LLBlockList::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
- BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
+ bool handled = LLUICtrl::handleRightMouseDown(x, y, mask);
LLToggleableMenu* context_menu = mContextMenu.get();
if (context_menu && size())
@@ -266,7 +266,7 @@ void LLBlockList::refresh()
selectItemPair(getItemPair(next_selected), true);
}
}
- mMuteListSize = LLMuteList::getInstance()->getMutes().size();
+ mMuteListSize = static_cast<U32>(LLMuteList::getInstance()->getMutes().size());
// Sort the list.
sort();