diff options
Diffstat (limited to 'indra/newview/lltoastimpanel.cpp')
-rw-r--r-- | indra/newview/lltoastimpanel.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp index b7353d6960..df79af4926 100644 --- a/indra/newview/lltoastimpanel.cpp +++ b/indra/newview/lltoastimpanel.cpp @@ -76,10 +76,10 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif mMessage->clear(); style_params.font.style ="ITALIC"; - mMessage->appendText(p.from, FALSE, style_params); + mMessage->appendText(p.from, false, style_params); style_params.font.style = "ITALIC"; - mMessage->appendText(p.message.substr(3), FALSE, style_params); + mMessage->appendText(p.message.substr(3), false, style_params); } else { @@ -120,18 +120,18 @@ LLToastIMPanel::~LLToastIMPanel() } //virtual -BOOL LLToastIMPanel::handleMouseUp(S32 x, S32 y, MASK mask) +bool LLToastIMPanel::handleMouseUp(S32 x, S32 y, MASK mask) { - if (LLPanel::handleMouseUp(x,y,mask) == FALSE) + if (!LLPanel::handleMouseUp(x, y, mask)) { mNotification->respond(mNotification->getResponseTemplate()); } - return TRUE; + return true; } //virtual -BOOL LLToastIMPanel::handleToolTip(S32 x, S32 y, MASK mask) +bool LLToastIMPanel::handleToolTip(S32 x, S32 y, MASK mask) { // It's not our direct child, so parentPointInView() doesn't work. LLRect ctrl_rect; @@ -140,14 +140,14 @@ BOOL LLToastIMPanel::handleToolTip(S32 x, S32 y, MASK mask) if (ctrl_rect.pointInRect(x, y)) { spawnNameToolTip(); - return TRUE; + return true; } mGroupIcon->localRectToOtherView(mGroupIcon->getLocalRect(), &ctrl_rect, this); if(mGroupIcon->getVisible() && ctrl_rect.pointInRect(x, y)) { spawnGroupIconToolTip(); - return TRUE; + return true; } return LLToastPanel::handleToolTip(x, y, mask); @@ -165,11 +165,11 @@ void LLToastIMPanel::spawnNameToolTip() params.background_visible(false); if(!mIsGroupMsg) { - params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_avatar", LLSD().with("avatar_id", mAvatarID), FALSE)); + params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_avatar", LLSD().with("avatar_id", mAvatarID), false)); } else { - params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_group", LLSD().with("group_id", mSessionID), FALSE)); + params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_group", LLSD().with("group_id", mSessionID), false)); } params.delay_time(0.0f); // spawn instantly on hover params.image(LLUI::getUIImage("Info_Small")); @@ -195,7 +195,7 @@ void LLToastIMPanel::spawnGroupIconToolTip() LLInspector::Params params; params.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>()); - params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_group", LLSD().with("group_id", mSessionID), FALSE)); + params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_group", LLSD().with("group_id", mSessionID), false)); params.delay_time(0.100f); params.image(LLUI::getUIImage("Info_Small")); params.message(g_data.mName); @@ -208,9 +208,9 @@ void LLToastIMPanel::spawnGroupIconToolTip() void LLToastIMPanel::initIcon() { - mAvatarIcon->setVisible(FALSE); - mGroupIcon->setVisible(FALSE); - mAdhocIcon->setVisible(FALSE); + mAvatarIcon->setVisible(false); + mGroupIcon->setVisible(false); + mAdhocIcon->setVisible(false); if(mAvatarName->getValue().asString() == SYSTEM_FROM) { @@ -230,15 +230,15 @@ void LLToastIMPanel::initIcon() switch(im_session->mSessionType) { case LLIMModel::LLIMSession::P2P_SESSION: - mAvatarIcon->setVisible(TRUE); + mAvatarIcon->setVisible(true); mAvatarIcon->setValue(mAvatarID); break; case LLIMModel::LLIMSession::GROUP_SESSION: - mGroupIcon->setVisible(TRUE); + mGroupIcon->setVisible(true); mGroupIcon->setValue(mSessionID); break; case LLIMModel::LLIMSession::ADHOC_SESSION: - mAdhocIcon->setVisible(TRUE); + mAdhocIcon->setVisible(true); mAdhocIcon->setValue(im_session->mOtherParticipantID); mAdhocIcon->setToolTip(im_session->mName); break; |