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

more misc: BOOL (int) to real bool

master
Lars Næsbye Christensen 2024-02-11 01:23:28 +01:00 committed by Andrey Lihatskiy
parent 70f8dc7a4f
commit 4419bb8709
82 changed files with 234 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llappearance/llavatarjoint.cpp
View File

@ -167,10 +167,10 @@ void LLAvatarJoint::updateJointGeometry()
}
BOOL LLAvatarJoint::updateLOD(F32 pixel_area, BOOL activate)
bool LLAvatarJoint::updateLOD(F32 pixel_area, bool activate)
{
BOOL lod_changed = FALSE;
BOOL found_lod = FALSE;
bool lod_changed = FALSE;
bool found_lod = FALSE;
for (LLJoint* child : mChildren)
{

6
indra/llappearance/llavatarjoint.h
View File

@ -62,7 +62,7 @@ public:
virtual BOOL isTransparent() { return mIsTransparent; }
// Returns true if this object should inherit scale modifiers from its immediate parent
virtual BOOL inheritScale() { return false; }
virtual bool inheritScale() { return false; }
enum Components
{
@ -99,7 +99,7 @@ public:
virtual U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) = 0;
virtual void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area);
virtual void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE, bool terse_update = false);
virtual BOOL updateLOD(F32 pixel_area, BOOL activate);
virtual bool updateLOD(F32 pixel_area, bool activate);
virtual void updateJointGeometry();
virtual void dump();
@ -127,7 +127,7 @@ public:
LLAvatarJointCollisionVolume();
virtual ~LLAvatarJointCollisionVolume() {};
/*virtual*/ BOOL inheritScale() { return true; }
/*virtual*/ bool inheritScale() { return true; }
/*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE );
void renderCollision();

4
indra/llappearance/llavatarjointmesh.cpp
View File

@ -102,7 +102,7 @@ LLSkinJoint::~LLSkinJoint()
//-----------------------------------------------------------------------------
// LLSkinJoint::setupSkinJoint()
//-----------------------------------------------------------------------------
BOOL LLSkinJoint::setupSkinJoint( LLAvatarJoint *joint)
bool LLSkinJoint::setupSkinJoint( LLAvatarJoint *joint)
{
// find the named joint
mJoint = joint;
@ -182,7 +182,7 @@ LLAvatarJointMesh::~LLAvatarJointMesh()
//-----------------------------------------------------------------------------
// LLAvatarJointMesh::allocateSkinData()
//-----------------------------------------------------------------------------
BOOL LLAvatarJointMesh::allocateSkinData( U32 numSkinJoints )
bool LLAvatarJointMesh::allocateSkinData( U32 numSkinJoints )
{
mSkinJoints = new LLSkinJoint[ numSkinJoints ];
mNumSkinJoints = numSkinJoints;

4
indra/llappearance/llavatarjointmesh.h
View File

@ -49,7 +49,7 @@ class LLSkinJoint
public:
LLSkinJoint();
~LLSkinJoint();
BOOL setupSkinJoint( LLAvatarJoint *joint);
bool setupSkinJoint( LLAvatarJoint *joint);
LLAvatarJoint *mJoint;
LLVector3 mRootToJointSkinOffset;
@ -135,7 +135,7 @@ public:
private:
// Allocate skin data
BOOL allocateSkinData( U32 numSkinJoints );
bool allocateSkinData( U32 numSkinJoints );
// Free skin data
void freeSkinData();

2
indra/llappearance/lldriverparam.cpp
View File

@ -41,7 +41,7 @@ LLDriverParamInfo::LLDriverParamInfo() :
{
}
BOOL LLDriverParamInfo::parseXml(LLXmlTreeNode* node)
bool LLDriverParamInfo::parseXml(LLXmlTreeNode* node)
{
llassert( node->hasName( "param" ) && node->getChildByName( "param_driver" ) );

2
indra/llappearance/lldriverparam.h
View File

@ -65,7 +65,7 @@ public:
LLDriverParamInfo();
/*virtual*/ ~LLDriverParamInfo() {};
/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
/*virtual*/ bool parseXml(LLXmlTreeNode* node);
/*virtual*/ void toStream(std::ostream &out);

2
indra/llappearance/llpolymorph.cpp
View File

@ -260,7 +260,7 @@ LLPolyMorphTargetInfo::LLPolyMorphTargetInfo()
{
}
BOOL LLPolyMorphTargetInfo::parseXml(LLXmlTreeNode* node)
bool LLPolyMorphTargetInfo::parseXml(LLXmlTreeNode* node)
{
llassert( node->hasName( "param" ) && node->getChildByName( "param_morph" ) );

2
indra/llappearance/llpolymorph.h
View File

@ -129,7 +129,7 @@ public:
LLPolyMorphTargetInfo();
/*virtual*/ ~LLPolyMorphTargetInfo() {};
/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
/*virtual*/ bool parseXml(LLXmlTreeNode* node);
protected:
std::string mMorphName;

6
indra/llappearance/llpolyskeletaldistortion.cpp
View File

@ -45,7 +45,7 @@ LLPolySkeletalDistortionInfo::LLPolySkeletalDistortionInfo()
{
}
BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
bool LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
{
llassert( node->hasName( "param" ) && node->getChildByName( "param_skeleton" ) );
@ -68,7 +68,7 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
std::string name;
LLVector3 scale;
LLVector3 pos;
BOOL haspos = FALSE;
BOOL haspos = false;
static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
if (!bone->getFastAttributeString(name_string, name))
@ -88,7 +88,7 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
static LLStdStringHandle offset_string = LLXmlTree::addAttributeString("offset");
if (bone->getFastAttributeVector3(offset_string, pos))
{
haspos = TRUE;
haspos = true;
}
mBoneInfoList.push_back(LLPolySkeletalBoneInfo(name, scale, pos, haspos));
}

2
indra/llappearance/llpolyskeletaldistortion.h
View File

@ -71,7 +71,7 @@ public:
LLPolySkeletalDistortionInfo();
/*virtual*/ ~LLPolySkeletalDistortionInfo() {};
/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
/*virtual*/ bool parseXml(LLXmlTreeNode* node);
protected:
typedef std::vector<LLPolySkeletalBoneInfo> bone_info_list_t;

2
indra/llappearance/lltexglobalcolor.cpp
View File

@ -135,7 +135,7 @@ LLTexGlobalColorInfo::~LLTexGlobalColorInfo()
mParamColorInfoList.clear();
}
BOOL LLTexGlobalColorInfo::parseXml(LLXmlTreeNode* node)
bool LLTexGlobalColorInfo::parseXml(LLXmlTreeNode* node)
{
// name attribute
static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");

2
indra/llappearance/lltexglobalcolor.h
View File

@ -62,7 +62,7 @@ public:
LLTexGlobalColorInfo();
~LLTexGlobalColorInfo();
BOOL parseXml(LLXmlTreeNode* node);
bool parseXml(LLXmlTreeNode* node);
private:
param_color_info_list_t mParamColorInfoList;

6
indra/llappearance/lltexlayer.cpp
View File

@ -59,7 +59,7 @@ public:
LLTexLayerInfo();
~LLTexLayerInfo();
BOOL parseXml(LLXmlTreeNode* node);
bool parseXml(LLXmlTreeNode* node);
BOOL createVisualParams(LLAvatarAppearance *appearance);
BOOL isUserSettable() { return mLocalTexture != -1; }
S32 getLocalTexture() const { return mLocalTexture; }
@ -185,7 +185,7 @@ LLTexLayerSetInfo::~LLTexLayerSetInfo( )
mLayerInfoList.clear();
}
BOOL LLTexLayerSetInfo::parseXml(LLXmlTreeNode* node)
bool LLTexLayerSetInfo::parseXml(LLXmlTreeNode* node)
{
llassert( node->hasName( "layer_set" ) );
if( !node->hasName( "layer_set" ) )
@ -579,7 +579,7 @@ LLTexLayerInfo::~LLTexLayerInfo( )
mParamAlphaInfoList.clear();
}
BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
bool LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
{
llassert( node->hasName( "layer" ) );

2
indra/llappearance/lltexlayer.h
View File

@ -243,7 +243,7 @@ class LLTexLayerSetInfo
public:
LLTexLayerSetInfo();
~LLTexLayerSetInfo();
BOOL parseXml(LLXmlTreeNode* node);
bool parseXml(LLXmlTreeNode* node);
void createVisualParams(LLAvatarAppearance *appearance);
S32 getWidth() const { return mWidth; }
S32 getHeight() const { return mHeight; }

4
indra/llappearance/lltexlayerparams.cpp
View File

@ -378,7 +378,7 @@ LLTexLayerParamAlphaInfo::LLTexLayerParamAlphaInfo() :
{
}
BOOL LLTexLayerParamAlphaInfo::parseXml(LLXmlTreeNode* node)
bool LLTexLayerParamAlphaInfo::parseXml(LLXmlTreeNode* node)
{
llassert(node->hasName("param") && node->getChildByName("param_alpha"));
@ -538,7 +538,7 @@ LLTexLayerParamColorInfo::LLTexLayerParamColorInfo() :
{
}
BOOL LLTexLayerParamColorInfo::parseXml(LLXmlTreeNode *node)
bool LLTexLayerParamColorInfo::parseXml(LLXmlTreeNode *node)
{
llassert(node->hasName("param") && node->getChildByName("param_color"));

4
indra/llappearance/lltexlayerparams.h
View File

@ -120,7 +120,7 @@ public:
LLTexLayerParamAlphaInfo();
/*virtual*/ ~LLTexLayerParamAlphaInfo() {};
/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
/*virtual*/ bool parseXml(LLXmlTreeNode* node);
private:
std::string mStaticImageFileName;
@ -189,7 +189,7 @@ class LLTexLayerParamColorInfo : public LLViewerVisualParamInfo
public:
LLTexLayerParamColorInfo();
virtual ~LLTexLayerParamColorInfo() {};
BOOL parseXml( LLXmlTreeNode* node );
bool parseXml( LLXmlTreeNode* node );
LLTexLayerParamColor::EColorOperation getOperation() const { return mOperation; }
private:
enum { MAX_COLOR_VALUES = 20 };

2
indra/llappearance/llviewervisualparam.cpp
View File

@ -57,7 +57,7 @@ LLViewerVisualParamInfo::~LLViewerVisualParamInfo()
//-----------------------------------------------------------------------------
// parseXml()
//-----------------------------------------------------------------------------
BOOL LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node)
bool LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node)
{
llassert( node->hasName( "param" ) );

2
indra/llappearance/llviewervisualparam.h
View File

@ -43,7 +43,7 @@ public:
LLViewerVisualParamInfo();
/*virtual*/ ~LLViewerVisualParamInfo();
/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
/*virtual*/ bool parseXml(LLXmlTreeNode* node);
/*virtual*/ void toStream(std::ostream &out);

2
indra/llcharacter/lleditingmotion.h
View File

@ -69,7 +69,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return true; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }

4
indra/llcharacter/llhandmotion.h
View File

@ -82,7 +82,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return true; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }
@ -119,7 +119,7 @@ public:
// called when a motion is deactivated
virtual void onDeactivate();
virtual BOOL canDeprecate() { return FALSE; }
virtual bool canDeprecate() { return false; }
static std::string getHandPoseName(eHandPose pose);
static eHandPose getHandPose(std::string posename);

4
indra/llcharacter/llheadrotmotion.h
View File

@ -64,7 +64,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return true; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }
@ -147,7 +147,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return true; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }

134
indra/llcharacter/llkeyframemotion.cpp
View File

@ -645,7 +645,7 @@ BOOL LLKeyframeMotion::setupPose()
mPelvisp = mCharacter->getJoint("mPelvis");
if (!mPelvisp)
{
return FALSE;
return false;
}
}
@ -1240,13 +1240,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
if (!dp.unpackU16(version, "version"))
{
LL_WARNS() << "can't read version number for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackU16(sub_version, "sub_version"))
{
LL_WARNS() << "can't read sub version number for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (version == 0 && sub_version == 1)
@ -1258,7 +1258,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
#if LL_RELEASE
LL_WARNS() << "Bad animation version " << version << "." << sub_version
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
#else
LL_ERRS() << "Bad animation version " << version << "." << sub_version
<< " for animation " << asset_id << LL_ENDL;
@ -1269,7 +1269,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read animation base_priority"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
joint_motion_list->mBasePriority = (LLJoint::JointPriority) temp_priority;
@ -1282,7 +1282,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "bad animation base_priority " << joint_motion_list->mBasePriority
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
//-------------------------------------------------------------------------
@ -1292,7 +1292,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read duration"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (joint_motion_list->mDuration > MAX_ANIM_DURATION ||
@ -1300,7 +1300,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "invalid animation duration"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
//-------------------------------------------------------------------------
@ -1310,14 +1310,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read optional_emote_animation"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if(joint_motion_list->mEmoteName==mID.asString())
{
LL_WARNS() << "Malformed animation mEmoteName==mID"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
//-------------------------------------------------------------------------
@ -1328,7 +1328,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read loop point"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackF32(joint_motion_list->mLoopOutPoint, "loop_out_point") ||
@ -1336,14 +1336,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read loop point"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackS32(joint_motion_list->mLoop, "loop"))
{
LL_WARNS() << "can't read loop"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
//SL-17206 hack to alter Female_land loop setting, while current behavior won't be changed serverside
@ -1363,7 +1363,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read easeIn"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackF32(joint_motion_list->mEaseOutDuration, "ease_out_duration") ||
@ -1371,7 +1371,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read easeOut"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
//-------------------------------------------------------------------------
@ -1382,14 +1382,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read hand pose"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if(word > LLHandMotion::NUM_HAND_POSES)
{
LL_WARNS() << "invalid LLHandMotion::eHandPose index: " << word
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
joint_motion_list->mHandPose = (LLHandMotion::eHandPose)word;
@ -1404,20 +1404,20 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read number of joints"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (num_motions == 0)
{
LL_WARNS() << "no joints"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
else if (num_motions > LL_CHARACTER_MAX_ANIMATED_JOINTS)
{
LL_WARNS() << "too many joints"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
joint_motion_list->mJointMotionArray.clear();
@ -1439,14 +1439,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read joint name"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (joint_name == "mScreen" || joint_name == "mRoot")
{
LL_WARNS() << "attempted to animate special " << joint_name << " joint"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
//---------------------------------------------------------------------
@ -1473,7 +1473,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
<< " for animation " << asset_id << LL_ENDL;
if (!allow_invalid_joints)
{
return FALSE;
return false;
}
}
@ -1492,14 +1492,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read joint priority."
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (joint_priority < LLJoint::USE_MOTION_PRIORITY)
{
LL_WARNS() << "joint priority unknown - too low."
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
joint_motion->mPriority = (LLJoint::JointPriority)joint_priority;
@ -1518,7 +1518,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read number of rotation keys"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
joint_motion->mRotationCurve.mInterpolationType = IT_LINEAR;
@ -1544,7 +1544,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read rotation key (" << k << ")"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
}
@ -1554,7 +1554,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read rotation key (" << k << ")"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
time = U16_to_F32(time_short, 0.f, joint_motion_list->mDuration);
@ -1563,7 +1563,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "invalid frame time"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
}
@ -1577,12 +1577,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
if (!dp.unpackVector3(rot_angles, "rot_angles"))
{
LL_WARNS() << "can't read rot_angles in rotation key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
if (!rot_angles.isFinite())
{
LL_WARNS() << "non-finite angle in rotation key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
LLQuaternion::Order ro = StringToOrder("ZYX");
@ -1593,17 +1593,17 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
if (!dp.unpackU16(x, "rot_angle_x"))
{
LL_WARNS() << "can't read rot_angle_x in rotation key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackU16(y, "rot_angle_y"))
{
LL_WARNS() << "can't read rot_angle_y in rotation key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackU16(z, "rot_angle_z"))
{
LL_WARNS() << "can't read rot_angle_z in rotation key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
LLVector3 rot_vec;
@ -1615,7 +1615,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "non-finite angle in rotation key (" << k << ")"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
rot_key.mRotation.unpackFromVector3(rot_vec);
}
@ -1624,7 +1624,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "non-finite angle in rotation key (" << k << ")"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
rCurve->mKeys[time] = rot_key;
@ -1643,7 +1643,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read number of position keys"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
joint_motion->mPositionCurve.mInterpolationType = IT_LINEAR;
@ -1669,7 +1669,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read position key (" << k << ")"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
}
else
@ -1678,7 +1678,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read position key (" << k << ")"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
pos_key.mTime = U16_to_F32(time_short, 0.f, joint_motion_list->mDuration);
@ -1689,7 +1689,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
if (!dp.unpackVector3(pos_key.mPosition, "pos"))
{
LL_WARNS() << "can't read pos in position key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
//MAINT-6162
@ -1705,17 +1705,17 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
if (!dp.unpackU16(x, "pos_x"))
{
LL_WARNS() << "can't read pos_x in position key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackU16(y, "pos_y"))
{
LL_WARNS() << "can't read pos_y in position key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackU16(z, "pos_z"))
{
LL_WARNS() << "can't read pos_z in position key (" << k << ")" << LL_ENDL;
return FALSE;
return false;
}
pos_key.mPosition.mV[VX] = U16_to_F32(x, -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET);
@ -1727,7 +1727,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "non-finite position in key"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
pCurve->mKeys[pos_key.mTime] = pos_key;
@ -1764,7 +1764,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read number of constraints"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (num_constraints > MAX_CONSTRAINTS || num_constraints < 0)
@ -1788,7 +1788,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read constraint chain length"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
constraintp->mChainLength = (S32) byte;
@ -1796,21 +1796,21 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "invalid constraint chain length"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackU8(byte, "constraint_type"))
{
LL_WARNS() << "can't read constraint type"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if( byte >= NUM_CONSTRAINT_TYPES )
{
LL_WARNS() << "invalid constraint type"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
constraintp->mConstraintType = (EConstraintType)byte;
@ -1820,7 +1820,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read source volume name"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
bin_data[BIN_DATA_LENGTH] = 0; // Ensure null termination
@ -1830,28 +1830,28 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "not a valid source constraint volume " << str
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackVector3(constraintp->mSourceConstraintOffset, "source_offset"))
{
LL_WARNS() << "can't read constraint source offset"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if( !(constraintp->mSourceConstraintOffset.isFinite()) )
{
LL_WARNS() << "non-finite constraint source offset"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackBinaryDataFixed(bin_data, BIN_DATA_LENGTH, "target_volume"))
{
LL_WARNS() << "can't read target volume name"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
bin_data[BIN_DATA_LENGTH] = 0; // Ensure null termination
@ -1869,7 +1869,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "not a valid target constraint volume " << str
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
}
@ -1877,28 +1877,28 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read constraint target offset"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if( !(constraintp->mTargetConstraintOffset.isFinite()) )
{
LL_WARNS() << "non-finite constraint target offset"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackVector3(constraintp->mTargetConstraintDir, "target_dir"))
{
LL_WARNS() << "can't read constraint target direction"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if( !(constraintp->mTargetConstraintDir.isFinite()) )
{
LL_WARNS() << "non-finite constraint target direction"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!constraintp->mTargetConstraintDir.isExactlyZero())
@ -1911,35 +1911,35 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "can't read constraint ease in start time"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackF32(constraintp->mEaseInStopTime, "ease_in_stop") || !llfinite(constraintp->mEaseInStopTime))
{
LL_WARNS() << "can't read constraint ease in stop time"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackF32(constraintp->mEaseOutStartTime, "ease_out_start") || !llfinite(constraintp->mEaseOutStartTime))
{
LL_WARNS() << "can't read constraint ease out start time"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if (!dp.unpackF32(constraintp->mEaseOutStopTime, "ease_out_stop") || !llfinite(constraintp->mEaseOutStopTime))
{
LL_WARNS() << "can't read constraint ease out stop time"
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
LLJoint* joint = mCharacter->findCollisionVolume(constraintp->mSourceConstraintVolume);
// get joint to which this collision volume is attached
if (!joint)
{
return FALSE;
return false;
}
constraintp->mJointStateIndices = new S32[constraintp->mChainLength + 1]; // note: mChainLength is size-limited - comes from a byte
@ -1952,7 +1952,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
LL_WARNS() << "Joint with no parent: " << joint->getName()
<< " Emote: " << joint_motion_list->mEmoteName
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
joint = parent;
constraintp->mJointStateIndices[i] = -1;
@ -1964,7 +1964,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "Invalid joint " << j
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
if(constraint_joint == joint)
@ -1977,7 +1977,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
{
LL_WARNS() << "No joint index for constraint " << i
<< " for animation " << asset_id << LL_ENDL;
return FALSE;
return false;
}
}

6
indra/llcharacter/llkeyframemotion.h
View File

@ -86,9 +86,9 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() {
if (mJointMotionList) return mJointMotionList->mLoop;
else return FALSE;
virtual bool getLoop() {
if (mJointMotionList) return mJointMotionList->mLoop;
else return false;
}
// motions must report their total duration

2
indra/llcharacter/llkeyframemotionparam.h
View File

@ -67,7 +67,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() {
virtual bool getLoop() {
return true;
}

4
indra/llcharacter/llkeyframewalkmotion.h
View File

@ -104,7 +104,7 @@ public:
virtual void onDeactivate();
virtual BOOL onUpdate(F32 time, U8* joint_mask);
virtual LLJoint::JointPriority getPriority(){return LLJoint::HIGH_PRIORITY;}
virtual BOOL getLoop() { return true; }
virtual bool getLoop() { return true; }
virtual F32 getDuration() { return 0.f; }
virtual F32 getEaseInDuration() { return 0.f; }
virtual F32 getEaseOutDuration() { return 0.f; }
@ -154,7 +154,7 @@ public:
virtual void onDeactivate() {};
virtual BOOL onUpdate(F32 time, U8* joint_mask);
virtual LLJoint::JointPriority getPriority(){return LLJoint::HIGHER_PRIORITY;}
virtual BOOL getLoop() { return true; }
virtual bool getLoop() { return true; }
virtual F32 getDuration() { return 0.f; }
virtual F32 getEaseInDuration() { return 0.f; }
virtual F32 getEaseOutDuration() { return 0.f; }

2
indra/llcharacter/llmotion.cpp
View File

@ -169,7 +169,7 @@ void LLMotion::deactivate()
onDeactivate();
}
BOOL LLMotion::canDeprecate()
bool LLMotion::canDeprecate()
{
return true;
}

8
indra/llcharacter/llmotion.h
View File

@ -115,7 +115,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() = 0;
virtual bool getLoop() = 0;
// motions must report their total duration
virtual F32 getDuration() = 0;
@ -154,7 +154,7 @@ public:
// can we crossfade this motion with a new instance when restarted?
// should ultimately always be TRUE, but lack of emote blending, etc
// requires this
virtual BOOL canDeprecate();
virtual bool canDeprecate();
// optional callback routine called when animation deactivated.
void setDeactivateCallback( void (*cb)(void *), void* userdata );
@ -199,7 +199,7 @@ public:
LLTestMotion(const LLUUID &id) : LLMotion(id){}
~LLTestMotion() {}
static LLMotion *create(const LLUUID& id) { return new LLTestMotion(id); }
BOOL getLoop() { return FALSE; }
bool getLoop() { return false; }
F32 getDuration() { return 0.0f; }
F32 getEaseInDuration() { return 0.0f; }
F32 getEaseOutDuration() { return 0.0f; }
@ -225,7 +225,7 @@ public:
static LLMotion *create(const LLUUID &id) { return new LLNullMotion(id); }
// motions must specify whether or not they loop
/*virtual*/ BOOL getLoop() { return true; }
/*virtual*/ bool getLoop() { return true; }
// motions must report their total duration
/*virtual*/ F32 getDuration() { return 1.f; }

10
indra/llcharacter/llstatemachine.cpp
View File

@ -89,7 +89,7 @@ BOOL LLStateDiagram::addTransition(LLFSMState& start_state, LLFSMState& end_stat
if (transition_it != state_transitions->end())
{
LL_ERRS() << "LLStateTable::addDirectedTransition() : transition already exists" << LL_ENDL;
return FALSE; // transition already exists
return false; // transition already exists
}
(*state_transitions)[&transition] = &end_state;
@ -185,7 +185,7 @@ BOOL LLStateDiagram::stateIsValid(LLFSMState& state)
{
return true;
}
return FALSE;
return false;
}
LLFSMState* LLStateDiagram::getState(U32 state_id)
@ -209,7 +209,7 @@ BOOL LLStateDiagram::saveDotFile(const std::string& filename)
if (!dot_file)
{
LL_WARNS() << "LLStateDiagram::saveDotFile() : Couldn't open " << filename << " to save state diagram." << LL_ENDL;
return FALSE;
return false;
}
apr_file_printf(dot_file, "digraph StateMachine {\n\tsize=\"100,100\";\n\tfontsize=40;\n\tlabel=\"Finite State Machine\";\n\torientation=landscape\n\tratio=.77\n");
@ -322,7 +322,7 @@ BOOL LLStateMachine::setCurrentState(LLFSMState *initial_state, void* user_data,
return true;
}
return FALSE;
return false;
}
BOOL LLStateMachine::setCurrentState(U32 state_id, void* user_data, BOOL skip_entry)
@ -341,7 +341,7 @@ BOOL LLStateMachine::setCurrentState(U32 state_id, void* user_data, BOOL skip_en
return true;
}
return FALSE;
return false;
}
void LLStateMachine::processTransition(LLFSMTransition& transition, void* user_data)

2
indra/llcharacter/lltargetingmotion.h
View File

@ -66,7 +66,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return true; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }

10
indra/llcharacter/llvisualparam.cpp
View File

@ -48,7 +48,7 @@ LLVisualParamInfo::LLVisualParamInfo()
//-----------------------------------------------------------------------------
// parseXml()
//-----------------------------------------------------------------------------
BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
bool LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
{
// attribute: id
static LLStdStringHandle id_string = LLXmlTree::addAttributeString("id");
@ -102,7 +102,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
else
{
LL_WARNS() << "Avatar file: <param> has invalid sex attribute: " << sex << LL_ENDL;
return FALSE;
return false;
}
// attribute: name
@ -110,7 +110,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
if( !node->getFastAttributeString( name_string, mName ) )
{
LL_WARNS() << "Avatar file: <param> is missing name attribute" << LL_ENDL;
return FALSE;
return false;
}
// attribute: label
@ -211,7 +211,7 @@ BOOL LLVisualParam::setInfo(LLVisualParamInfo *info)
{
llassert(mInfo == NULL);
if (info->mID < 0)
return FALSE;
return false;
mInfo = info;
mID = info->mID;
setWeight(getDefaultWeight(), FALSE );
@ -227,7 +227,7 @@ BOOL LLVisualParam::parseData(LLXmlTreeNode *node)
info->parseXml(node);
if (!setInfo(info))
return FALSE;
return false;
return true;
}

2
indra/llcharacter/llvisualparam.h
View File

@ -74,7 +74,7 @@ public:
LLVisualParamInfo();
virtual ~LLVisualParamInfo() {};
virtual BOOL parseXml(LLXmlTreeNode *node);
virtual bool parseXml(LLXmlTreeNode *node);
S32 getID() const { return mID; }

8
indra/llcommon/is_approx_equal_fraction.h
View File

@ -43,9 +43,9 @@
* signatures.
*/
template <typename FTYPE>
inline BOOL is_approx_equal_fraction_impl(FTYPE x, FTYPE y, U32 frac_bits)
inline bool is_approx_equal_fraction_impl(FTYPE x, FTYPE y, U32 frac_bits)
{
BOOL ret = true;
bool ret = true;
FTYPE diff = (FTYPE) fabs(x - y);
S32 diffInt = (S32) diff;
@ -65,13 +65,13 @@ inline BOOL is_approx_equal_fraction_impl(FTYPE x, FTYPE y, U32 frac_bits)
}
/// F32 flavor
inline BOOL is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
inline bool is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
{
return is_approx_equal_fraction_impl<F32>(x, y, frac_bits);
}
/// F64 flavor
inline BOOL is_approx_equal_fraction(F64 x, F64 y, U32 frac_bits)
inline bool is_approx_equal_fraction(F64 x, F64 y, U32 frac_bits)
{
return is_approx_equal_fraction_impl<F64>(x, y, frac_bits);
}

4
indra/llcommon/llcallbacklist.cpp
View File

@ -191,7 +191,7 @@ public:
}
private:
BOOL tick()
bool tick()
{
mCallable();
return true;
@ -215,7 +215,7 @@ public:
{
}
private:
BOOL tick()
bool tick()
{
return mCallable();
}

4
indra/llcommon/lleventtimer.h
View File

@ -43,7 +43,7 @@ public:
//function to be called at the supplied frequency
// Normally return FALSE; TRUE will delete the timer after the function returns.
virtual BOOL tick() = 0;
virtual bool tick() = 0;
static void updateClass();
@ -86,7 +86,7 @@ public:
mOnce(once),
mCallable(callable)
{}
BOOL tick() override
bool tick() override
{
mCallable();
// true tells updateClass() to delete this instance

6
indra/llcommon/lllivefile.cpp
View File

@ -170,10 +170,10 @@ namespace
: LLEventTimer(refresh), mLiveFile(f)
{ }
BOOL tick()
{
bool tick()
{
mLiveFile.checkAndReload();
return FALSE;
return false;
}
private:

2
indra/llcommon/llmainthreadtask.h
View File

@ -79,7 +79,7 @@ private:
LLEventTimer(0),
mTask(std::forward<CALLABLE>(callable))
{}
BOOL tick() override
bool tick() override
{
// run the task on the main thread, will populate the future
// obtained by get_future()

2
indra/llui/llflashtimer.cpp
View File

@ -53,7 +53,7 @@ void LLFlashTimer::unset()
mCallback = NULL;
}
BOOL LLFlashTimer::tick()
bool LLFlashTimer::tick()
{
mIsCurrentlyHighlighted = !mIsCurrentlyHighlighted;

2
indra/llui/llflashtimer.h
View File

@ -46,7 +46,7 @@ public:
LLFlashTimer(callback_t cb = NULL, S32 count = 0, F32 period = 0.0);
~LLFlashTimer() {};
/*virtual*/ BOOL tick();
/*virtual*/ bool tick();
void startFlashing();
void stopFlashing();

6
indra/newview/llappearancemgr.cpp
View File

@ -125,13 +125,13 @@ public:
}
/*virtual*/
BOOL tick()
bool tick()
{
if(mEventTimer.hasExpired())
{
LLAppearanceMgr::instance().setOutfitLocked(false);
}
return FALSE;
return false;
}
void stop() { mEventTimer.stop(); }
void start() { mEventTimer.start(); }
@ -333,7 +333,7 @@ public:
// virtual
// Will be deleted after returning true - only safe to do this if all callbacks have fired.
BOOL tick()
bool tick()
{
// mPendingRequests will be zero if all requests have been
// responded to. mWaitTimes.empty() will be true if we have

2
indra/newview/llbreastmotion.h
View File

@ -66,7 +66,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return TRUE; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }

6
indra/newview/llcallbacklist.cpp
View File

@ -191,10 +191,10 @@ public:
}
private:
BOOL tick()
bool tick()
{
mCallable();
return TRUE;
return true;
}
nullary_func_t mCallable;
@ -215,7 +215,7 @@ public:
{
}
private:
BOOL tick()
bool tick()
{
return mCallable();
}

4
indra/newview/lldonotdisturbnotificationstorage.cpp
View File

@ -55,7 +55,7 @@ LLDoNotDisturbNotificationStorageTimer::~LLDoNotDisturbNotificationStorageTimer(
}
BOOL LLDoNotDisturbNotificationStorageTimer::tick()
bool LLDoNotDisturbNotificationStorageTimer::tick()
{
LLDoNotDisturbNotificationStorage * doNotDisturbNotificationStorage = LLDoNotDisturbNotificationStorage::getInstance();
@ -64,7 +64,7 @@ BOOL LLDoNotDisturbNotificationStorageTimer::tick()
{
doNotDisturbNotificationStorage->saveNotifications();
}
return FALSE;
return false;
}
LLDoNotDisturbNotificationStorage::LLDoNotDisturbNotificationStorage()

2
indra/newview/lldonotdisturbnotificationstorage.h
View File

@ -42,7 +42,7 @@ public:
~LLDoNotDisturbNotificationStorageTimer();
public:
BOOL tick();
bool tick();
};
class LLDoNotDisturbNotificationStorage : public LLParamSingleton<LLDoNotDisturbNotificationStorage>, public LLNotificationStorage

4
indra/newview/llemote.h
View File

@ -69,7 +69,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return FALSE; }
virtual bool getLoop() { return false; }
// motions must report their total duration
virtual F32 getDuration() { return EMOTE_MORPH_FADEIN_TIME + EMOTE_MORPH_IN_TIME + EMOTE_MORPH_FADEOUT_TIME; }
@ -106,7 +106,7 @@ public:
// called when a motion is deactivated
virtual void onDeactivate();
virtual BOOL canDeprecate() { return FALSE; }
virtual bool canDeprecate() { return false; }
protected:

4
indra/newview/llfloaterlinkreplace.cpp
View File

@ -310,7 +310,7 @@ void LLFloaterLinkReplace::decreaseOpenItemCount()
}
}
BOOL LLFloaterLinkReplace::tick()
bool LLFloaterLinkReplace::tick()
{
LL_DEBUGS() << "Calling tick - remaining items = " << mRemainingInventoryItems.size() << LL_ENDL;
@ -329,7 +329,7 @@ BOOL LLFloaterLinkReplace::tick()
}
processBatch(current_batch);
return FALSE;
return false;
}
void LLFloaterLinkReplace::processBatch(LLInventoryModel::item_array_t items)

2
indra/newview/llfloaterlinkreplace.h
View File

@ -89,7 +89,7 @@ public:
BOOL postBuild();
virtual void onOpen(const LLSD& key);
virtual BOOL tick();
virtual bool tick();
private:
void checkEnableStart();

4
indra/newview/llfloaterpreference.cpp
View File

@ -1980,12 +1980,12 @@ public:
protected:
BOOL tick()
bool tick()
{
mCallback(mNewValue);
mEventTimer.stop();
return FALSE;
return false;
}
private:

4
indra/newview/llfloaterregionrestarting.cpp
View File

@ -74,11 +74,11 @@ void LLFloaterRegionRestarting::regionChange()
close();
}
BOOL LLFloaterRegionRestarting::tick()
bool LLFloaterRegionRestarting::tick()
{
refresh();
return FALSE;
return false;
}
void LLFloaterRegionRestarting::refresh()

2
indra/newview/llfloaterregionrestarting.h
View File

@ -43,7 +43,7 @@ private:
LLFloaterRegionRestarting(const LLSD& key);
virtual ~LLFloaterRegionRestarting();
virtual BOOL postBuild();
virtual BOOL tick();
virtual bool tick();
virtual void refresh();
virtual void draw();
virtual void regionChange();

12
indra/newview/llfloateruipreview.cpp
View File

@ -254,7 +254,7 @@ class LLFadeEventTimer : public LLEventTimer
{
public:
LLFadeEventTimer(F32 refresh, LLGUIPreviewLiveFile* parent);
BOOL tick();
bool tick();
LLGUIPreviewLiveFile* mParent;
private:
BOOL mFadingOut; // fades in then out; this is toggled in between
@ -355,17 +355,17 @@ LLFadeEventTimer::LLFadeEventTimer(F32 refresh, LLGUIPreviewLiveFile* parent)
}
// Single tick of fade event timer: increment the color
BOOL LLFadeEventTimer::tick()
bool LLFadeEventTimer::tick()
{
float diff = 0.04f;
if(TRUE == mFadingOut) // set fade for in/out color direction
if(true == mFadingOut) // set fade for in/out color direction
{
diff = -diff;
}
if(NULL == mParent) // no more need to tick, so suicide
{
return TRUE;
return true;
}
// Set up colors
@ -385,10 +385,10 @@ BOOL LLFadeEventTimer::tick()
if(bg_color[2] <= 0.0f) // end of fade out, start fading in
{
mFadingOut = FALSE;
mFadingOut = false;
}
return FALSE;
return false;
}
// Constructor

6
indra/newview/llimview.cpp
View File

@ -99,16 +99,16 @@ const LLUUID LLOutgoingCallDialog::OCD_KEY = LLUUID("7CF78E11-0CFE-498D-ADB9-141
LLIMMgr* gIMMgr = NULL;
BOOL LLSessionTimeoutTimer::tick()
bool LLSessionTimeoutTimer::tick()
{
if (mSessionId.isNull()) return TRUE;
if (mSessionId.isNull()) return true;
LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(mSessionId);
if (session && !session->mSessionInitialized)
{
gIMMgr->showSessionStartError("session_initialization_timed_out_error", mSessionId);
}
return TRUE;
return true;
}

2
indra/newview/llimview.h
View File

@ -51,7 +51,7 @@ class LLSessionTimeoutTimer : public LLEventTimer
public:
LLSessionTimeoutTimer(const LLUUID& session_id, F32 period) : LLEventTimer(period), mSessionId(session_id) {}
virtual ~LLSessionTimeoutTimer() {};
/* virtual */ BOOL tick();
/* virtual */ bool tick();
private:
LLUUID mSessionId;

4
indra/newview/lllocalbitmaps.cpp
View File

@ -1009,10 +1009,10 @@ bool LLLocalBitmapTimer::isRunning()
return mEventTimer.getStarted();
}
BOOL LLLocalBitmapTimer::tick()
bool LLLocalBitmapTimer::tick()
{
LLLocalBitmapMgr::getInstance()->doUpdates();
return FALSE;
return false;
}
/*=======================================*/

2
indra/newview/lllocalbitmaps.h
View File

@ -121,7 +121,7 @@ class LLLocalBitmapTimer : public LLEventTimer
void startTimer();
void stopTimer();
bool isRunning();
BOOL tick();
bool tick();
};

4
indra/newview/lllocalgltfmaterials.cpp
View File

@ -301,11 +301,11 @@ bool LLLocalGLTFMaterialTimer::isRunning()
return mEventTimer.getStarted();
}
BOOL LLLocalGLTFMaterialTimer::tick()
bool LLLocalGLTFMaterialTimer::tick()
{
// todo: do on idle? No point in timer
LLLocalGLTFMaterialMgr::getInstance()->doUpdates();
return FALSE;
return false;
}
/*=======================================*/

2
indra/newview/lllocalgltfmaterials.h
View File

@ -90,7 +90,7 @@ public:
void startTimer();
void stopTimer();
bool isRunning();
BOOL tick();
bool tick();
};
class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr>

8
indra/newview/llmediadataclient.cpp
View File

@ -418,9 +418,9 @@ LLMediaDataClient::QueueTimer::QueueTimer(F32 time, LLMediaDataClient *mdc)
}
// virtual
BOOL LLMediaDataClient::QueueTimer::tick()
bool LLMediaDataClient::QueueTimer::tick()
{
BOOL result = TRUE;
BOOL result = true;
if (!mMDC.isNull())
{
@ -451,7 +451,7 @@ LLMediaDataClient::RetryTimer::RetryTimer(F32 time, Request::ptr_t request)
}
// virtual
BOOL LLMediaDataClient::RetryTimer::tick()
bool LLMediaDataClient::RetryTimer::tick()
{
mRequest->stopTracking();
@ -469,7 +469,7 @@ BOOL LLMediaDataClient::RetryTimer::tick()
mRequest.reset();
// Don't fire again
return TRUE;
return true;
}

4
indra/newview/llmediadataclient.h
View File

@ -219,7 +219,7 @@ protected:
{
public:
RetryTimer(F32 time, Request::ptr_t);
virtual BOOL tick();
virtual bool tick();
private:
// back-pointer
Request::ptr_t mRequest;
@ -286,7 +286,7 @@ private:
{
public:
QueueTimer(F32 time, LLMediaDataClient *mdc);
virtual BOOL tick();
virtual bool tick();
private:
// back-pointer
LLPointer<LLMediaDataClient> mMDC;

14
indra/newview/llpanelpeople.cpp
View File

@ -313,9 +313,9 @@ public:
mEventTimer.stop();
}
virtual BOOL tick() // from LLEventTimer
virtual bool tick() // from LLEventTimer
{
return FALSE;
return false;
}
};
@ -367,9 +367,9 @@ public:
}
/*virtual*/ BOOL tick()
/*virtual*/ bool tick()
{
if (!mIsActive) return FALSE;
if (!mIsActive) return false;
if (mMask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE))
{
@ -380,7 +380,7 @@ public:
mEventTimer.stop();
mMask = 0;
return FALSE;
return false;
}
// virtual
@ -508,10 +508,10 @@ public:
}
}
/*virtual*/ BOOL tick()
/*virtual*/ bool tick()
{
update();
return FALSE;
return false;
}
private:
};

2
indra/newview/llphysicsmotion.h
View File

@ -66,7 +66,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return TRUE; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }

4
indra/newview/llsetkeybinddialog.cpp
View File

@ -53,11 +53,11 @@ public:
virtual ~Updater(){}
protected:
BOOL tick()
bool tick()
{
mCallback(mMask);
// Deletes itseft after execution
return TRUE;
return true;
}
private:

4
indra/newview/llspeakers.cpp
View File

@ -181,13 +181,13 @@ LLSpeakerActionTimer::LLSpeakerActionTimer(action_callback_t action_cb, F32 acti
{
}
BOOL LLSpeakerActionTimer::tick()
bool LLSpeakerActionTimer::tick()
{
if (mActionCallback)
{
return (BOOL)mActionCallback(mSpeakerId);
}
return TRUE;
return true;
}
void LLSpeakerActionTimer::unset()

2
indra/newview/llspeakers.h
View File

@ -159,7 +159,7 @@ public:
*
* If action callback is not specified returns true. Instance will be deleted by LLEventTimer::updateClass().
*/
virtual BOOL tick();
virtual bool tick();
/**
* Clears the callback.

4
indra/newview/lltoast.cpp
View File

@ -44,13 +44,13 @@ LLToastLifeTimer::LLToastLifeTimer(LLToast* toast, F32 period)
}
/*virtual*/
BOOL LLToastLifeTimer::tick()
bool LLToastLifeTimer::tick()
{
if (mEventTimer.hasExpired())
{
mToast->expire();
}
return FALSE;
return false;
}
void LLToastLifeTimer::stop()

2
indra/newview/lltoast.h
View File

@ -53,7 +53,7 @@ public:
LLToastLifeTimer(LLToast* toast, F32 period);
/*virtual*/
BOOL tick();
bool tick();
void stop();
void start();
void restart();

2
indra/newview/llviewerjointattachment.cpp
View File

@ -424,7 +424,7 @@ void LLViewerJointAttachment::calcLOD()
//-----------------------------------------------------------------------------
// updateLOD()
//-----------------------------------------------------------------------------
BOOL LLViewerJointAttachment::updateLOD(F32 pixel_area, BOOL activate)
bool LLViewerJointAttachment::updateLOD(F32 pixel_area, bool activate)
{
BOOL res = FALSE;
if (!mValid)

2
indra/newview/llviewerjointattachment.h
View File

@ -57,7 +57,7 @@ public:
// Called by render().
/*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy );
/*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
/*virtual*/ bool updateLOD(F32 pixel_area, bool activate);
//
// accessors

4
indra/newview/llviewerjointmesh.cpp
View File

@ -436,9 +436,9 @@ void LLViewerJointMesh::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_w
//-----------------------------------------------------------------------------
// updateLOD()
//-----------------------------------------------------------------------------
BOOL LLViewerJointMesh::updateLOD(F32 pixel_area, BOOL activate)
bool LLViewerJointMesh::updateLOD(F32 pixel_area, bool activate)
{
BOOL valid = mValid;
bool valid = mValid;
setValid(activate, TRUE);
return (valid != activate);
}

2
indra/newview/llviewerjointmesh.h
View File

@ -62,7 +62,7 @@ public:
/*virtual*/ void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area);
/*virtual*/ void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE, bool terse_update = false);
/*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
/*virtual*/ bool updateLOD(F32 pixel_area, bool activate);
/*virtual*/ void updateJointGeometry();
/*virtual*/ void dump();

8
indra/newview/llviewermessage.cpp
View File

@ -2885,7 +2885,7 @@ public:
virtual ~LLPostTeleportNotifiers();
//function to be called at the supplied frequency
virtual BOOL tick();
virtual bool tick();
};
LLPostTeleportNotifiers::LLPostTeleportNotifiers() : LLEventTimer( 2.0 )
@ -2896,9 +2896,9 @@ LLPostTeleportNotifiers::~LLPostTeleportNotifiers()
{
}
BOOL LLPostTeleportNotifiers::tick()
bool LLPostTeleportNotifiers::tick()
{
BOOL all_done = FALSE;
bool all_done = false;
if ( gAgent.getTeleportState() == LLAgent::TELEPORT_NONE )
{
// get callingcards and landmarks available to the user arriving.
@ -2922,7 +2922,7 @@ BOOL LLPostTeleportNotifiers::tick()
gInventory.addObserver(fetcher);
}
}
all_done = TRUE;
all_done = true;
}
return all_done;

6
indra/newview/llviewerobject.cpp
View File

@ -3656,14 +3656,14 @@ void LLViewerObject::setPixelAreaAndAngle(LLAgent &agent)
}
}
BOOL LLViewerObject::updateLOD()
bool LLViewerObject::updateLOD()
{
return FALSE;
return false;
}
BOOL LLViewerObject::updateGeometry(LLDrawable *drawable)
{
return TRUE;
return false;
}
void LLViewerObject::updateGL()

2
indra/newview/llviewerobject.h
View File

@ -221,7 +221,7 @@ public:
virtual BOOL updateGeometry(LLDrawable *drawable);
virtual void updateGL();
virtual void updateFaceSize(S32 idx);
virtual BOOL updateLOD();
virtual bool updateLOD();
virtual BOOL setDrawableParent(LLDrawable* parentp);
F32 getRotTime() { return mRotTime; }
private:

6
indra/newview/llviewerparcelmediaautoplay.cpp
View File

@ -60,7 +60,7 @@ void LLViewerParcelMediaAutoPlay::playStarted()
LLSingleton<LLViewerParcelMediaAutoPlay>::getInstance()->mPlayed = TRUE;
}
BOOL LLViewerParcelMediaAutoPlay::tick()
bool LLViewerParcelMediaAutoPlay::tick()
{
LLParcel *this_parcel = NULL;
LLViewerRegion *this_region = NULL;
@ -94,7 +94,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
this_region_id != mLastRegionID)
{
// we've entered a new parcel
mPlayed = FALSE; // we haven't autoplayed yet
mPlayed = false; // we haven't autoplayed yet
mTimeInParcel = 0; // reset our timer
mLastParcelID = this_parcel_id;
mLastRegionID = this_region_id;
@ -156,7 +156,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
}
return FALSE; // continue ticking forever please.
return false; // continue ticking forever please.
}
//static

2
indra/newview/llviewerparcelmediaautoplay.h
View File

@ -35,7 +35,7 @@ class LLViewerParcelMediaAutoPlay : LLEventTimer, public LLSingleton<LLViewerPar
{
LLSINGLETON(LLViewerParcelMediaAutoPlay);
public:
virtual BOOL tick();
virtual bool tick();
static void playStarted();
private:

8
indra/newview/llvoavatar.cpp
View File

@ -292,7 +292,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return TRUE; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }
@ -400,7 +400,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return TRUE; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }
@ -513,7 +513,7 @@ public:
//-------------------------------------------------------------------------
// motions must specify whether or not they loop
virtual BOOL getLoop() { return TRUE; }
virtual bool getLoop() { return true; }
// motions must report their total duration
virtual F32 getDuration() { return 0.0; }
@ -10427,7 +10427,7 @@ LLHost LLVOAvatar::getObjectHost() const
}
}
BOOL LLVOAvatar::updateLOD()
bool LLVOAvatar::updateLOD()
{
if (mDrawable.isNull())
{

2
indra/newview/llvoavatar.h
View File

@ -132,7 +132,7 @@ public:
const EObjectUpdateType update_type,
LLDataPacker *dp);
virtual void idleUpdate(LLAgent &agent, const F64 &time);
/*virtual*/ BOOL updateLOD();
/*virtual*/ bool updateLOD();
BOOL updateJointLODs();
void updateLODRiggedAttachments( void );
/*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate.

10
indra/newview/llvograss.cpp
View File

@ -333,11 +333,11 @@ void LLVOGrass::updateTextures()
}
}
BOOL LLVOGrass::updateLOD()
bool LLVOGrass::updateLOD()
{
if (mDrawable->getNumFaces() <= 0)
{
return FALSE;
return false;
}
LLFace* face = mDrawable->getFace(0);
@ -350,7 +350,7 @@ BOOL LLVOGrass::updateLOD()
face->setSize(0, 0);
gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
}
return TRUE ;
return true ;
}
if(!mNumBlades)
{
@ -387,10 +387,10 @@ BOOL LLVOGrass::updateLOD()
face->setSize(mNumBlades*8, mNumBlades*12);
}
gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
return TRUE;
return true;
}
return FALSE;
return false;
}
LLDrawable* LLVOGrass::createDrawable(LLPipeline *pipeline)

2
indra/newview/llvograss.h
View File

@ -67,7 +67,7 @@ public:
void updateFaceSize(S32 idx) { }
/*virtual*/ void updateTextures();
/*virtual*/ BOOL updateLOD();
/*virtual*/ bool updateLOD();
/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
void plantBlades();

4
indra/newview/llvosurfacepatch.cpp
View File

@ -236,9 +236,9 @@ void LLVOSurfacePatch::updateFaceSize(S32 idx)
}
}
BOOL LLVOSurfacePatch::updateLOD()
bool LLVOSurfacePatch::updateLOD()
{
return TRUE;
return true;
}
void LLVOSurfacePatch::getGeometry(LLStrider<LLVector3> &verticesp,

2
indra/newview/llvosurfacepatch.h
View File

@ -61,7 +61,7 @@ public:
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
/*virtual*/ void updateGL();
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable);
/*virtual*/ BOOL updateLOD();
/*virtual*/ bool updateLOD();
/*virtual*/ void updateFaceSize(S32 idx);
void getGeometry(LLStrider<LLVector3> &verticesp,
LLStrider<LLVector3> &normalsp,

10
indra/newview/llvovolume.cpp
View File

@ -1549,16 +1549,16 @@ BOOL LLVOVolume::calcLOD()
return FALSE;
}
BOOL LLVOVolume::updateLOD()
bool LLVOVolume::updateLOD()
{
if (mDrawable.isNull())
{
return FALSE;
return false;
}
LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME;
BOOL lod_changed = FALSE;
bool lod_changed = false;
if (!LLSculptIDSize::instance().isUnloaded(getVolume()->getParams().getSculptID()))
{
@ -1566,13 +1566,13 @@ BOOL LLVOVolume::updateLOD()
}
else
{
return FALSE;
return false;
}
if (lod_changed)
{
gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME);
mLODChanged = TRUE;
mLODChanged = true;
}
else
{

2
indra/newview/llvovolume.h
View File

@ -238,7 +238,7 @@ public:
void updateRelativeXform(bool force_identity = false);
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable) override;
/*virtual*/ void updateFaceSize(S32 idx) override;
/*virtual*/ BOOL updateLOD() override;
/*virtual*/ bool updateLOD() override;
void updateRadius() override;
/*virtual*/ void updateTextures() override;
void updateTextureVirtualSize(bool forced = false);