livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BOOL vs bool issues after merge

master
Ansariel 2024-04-24 19:49:27 +02:00 committed by Andrey Lihatskiy
parent 4c54488470
commit 5f4d312c8d
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llinventory/llpermissions.h
View File

@ -151,10 +151,10 @@ public:
U32 getMaskEveryone() const { return mMaskEveryone; }
U32 getMaskNextOwner() const { return mMaskNextOwner; }
// return TRUE if the object has any owner
// return true if the object has any owner
bool isOwned() const { return (mOwner.notNull() || mIsGroupOwned); }
// return TRUE if group_id is owner.
// return true if group_id is owner.
bool isGroupOwned() const { return mIsGroupOwned; }
// This API returns true if the object is owned at all, and false

2
indra/llmessage/lldatapacker.cpp
View File

@ -302,7 +302,7 @@ bool LLDataPackerBinaryBuffer::unpackBinaryData(U8 *value, S32 &size, const char
if (size < 0)
{
LL_WARNS() << "LLDataPackerBinaryBuffer::unpackBinaryData unpacked invalid size, aborting!" << LL_ENDL;
return FALSE;
return false;
}
mCurBufferp += 4;

2
indra/newview/llappviewer.cpp
View File

@ -4701,7 +4701,7 @@ void LLAppViewer::idle()
F32 agent_update_time = agent_update_timer.getElapsedTimeF32();
F32 agent_force_update_time = mLastAgentForceUpdate + agent_update_time;
bool timed_out = agent_update_time > (1.0f / (F32)AGENT_UPDATES_PER_SECOND);
BOOL force_send =
bool force_send =
// if there is something to send
(gAgent.controlFlagsDirty() && timed_out)
// if something changed

2
indra/newview/lloutfitslist.cpp
View File

@ -1356,7 +1356,7 @@ bool LLOutfitAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
.delay_time(LLView::getTooltipTimeout())
.create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
.create_params(params));
return TRUE;
return true;
}
return LLAccordionCtrlTab::handleToolTip(x, y, mask);

4
indra/newview/llpanelprofileclassifieds.cpp
View File

@ -650,8 +650,8 @@ bool LLPanelProfileClassified::postBuild()
mSnapshotCtrl->setOnSelectCallback(boost::bind(&LLPanelProfileClassified::onTextureSelected, this));
mSnapshotCtrl->setMouseEnterCallback(boost::bind(&LLPanelProfileClassified::onTexturePickerMouseEnter, this));
mSnapshotCtrl->setMouseLeaveCallback(boost::bind(&LLPanelProfileClassified::onTexturePickerMouseLeave, this));
mSnapshotCtrl->setAllowLocalTexture(FALSE);
mSnapshotCtrl->setBakeTextureEnabled(FALSE);
mSnapshotCtrl->setAllowLocalTexture(false);
mSnapshotCtrl->setBakeTextureEnabled(false);
mEditIcon->setVisible(false);
mMapButton->setCommitCallback(boost::bind(&LLPanelProfileClassified::onMapClick, this));

4
indra/newview/llpanelprofilepicks.cpp
View File

@ -590,8 +590,8 @@ bool LLPanelProfilePick::postBuild()
mSnapshotCtrl = getChild<LLTextureCtrl>("pick_snapshot");
mSnapshotCtrl->setCommitCallback(boost::bind(&LLPanelProfilePick::onSnapshotChanged, this));
mSnapshotCtrl->setAllowLocalTexture(FALSE);
mSnapshotCtrl->setBakeTextureEnabled(FALSE);
mSnapshotCtrl->setAllowLocalTexture(false);
mSnapshotCtrl->setBakeTextureEnabled(false);
childSetAction("teleport_btn", boost::bind(&LLPanelProfilePick::onClickTeleport, this));
childSetAction("show_on_map_btn", boost::bind(&LLPanelProfilePick::onClickMap, this));

2
indra/newview/llplacesinventorypanel.cpp
View File

@ -128,5 +128,5 @@ bool LLPlacesInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, bool dro
{
return LLInventoryPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
}
return FALSE;
return false;
}

2
indra/newview/tests/llviewerassetstats_test.cpp
View File

@ -43,7 +43,7 @@ namespace LLStatViewer
LLTrace::SampleStatHandle<> FPS_SAMPLE("fpssample");
}
void LLVOAvatar::getNearbyRezzedStats(std::vector<S32>& counts)
void LLVOAvatar::getNearbyRezzedStats(std::vector<S32>& counts, F32& avg_cloud_time, S32& cloud_avatars)
{
counts.resize(3);
counts[0] = 0;