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

Fix a bunch of uninitialized variable warnings that showed up in Visual Studio

master
Ansariel 2024-05-30 15:41:36 +02:00
parent c082f6f67a
commit cb3bd8865a
15 changed files with 147 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llappearance/llavatarappearance.cpp
View File

@ -164,19 +164,7 @@ LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary* LLAvatarAppearance::sAv
LLAvatarAppearance::LLAvatarAppearance(LLWearableData* wearable_data) :
LLCharacter(),
mIsDummy(false),
mTexSkinColor( NULL ),
mTexHairColor( NULL ),
mTexEyeColor( NULL ),
mPelvisToFoot(0.f),
mHeadOffset(),
mRoot(NULL),
mWearableData(wearable_data),
mNumBones(0),
mNumCollisionVolumes(0),
mCollisionVolumes(NULL),
mIsBuilt(false),
mInitFlags(0)
mWearableData(wearable_data)
{
llassert_always(mWearableData);
mBakedTextureDatas.resize(LLAvatarAppearanceDefines::BAKED_NUM_INDICES);

72
indra/llappearance/llavatarappearance.h
View File

@ -70,7 +70,7 @@ public:
static void initClass();
static void cleanupClass(); // Cleanup data that's only init'd once per class.
virtual void initInstance(); // Called after construction to initialize the instance.
S32 mInitFlags;
S32 mInitFlags{ 0 };
virtual bool loadSkeletonNode();
bool loadMeshNodes();
bool loadLayersets();
@ -135,8 +135,8 @@ public:
F32 getPelvisToFoot() const { return mPelvisToFoot; }
/*virtual*/ LLJoint* getRootJoint() { return mRoot; }
LLVector3 mHeadOffset; // current head position
LLAvatarJoint *mRoot;
LLVector3 mHeadOffset{}; // current head position
LLAvatarJoint* mRoot{ nullptr };
typedef std::map<std::string, LLJoint*> joint_map_t;
joint_map_t mJointMap;
@ -167,7 +167,7 @@ protected:
bool buildSkeleton(const LLAvatarSkeletonInfo *info);
void clearSkeleton();
bool mIsBuilt; // state of deferred character building
bool mIsBuilt{ false }; // state of deferred character building
avatar_joint_list_t mSkeleton;
LLVector3OverrideMap mPelvisFixups;
joint_alias_map_t mJointAliasMap;
@ -184,30 +184,30 @@ public:
LLVector3 mBodySize;
LLVector3 mAvatarOffset;
protected:
F32 mPelvisToFoot;
F32 mPelvisToFoot{ 0.f };
//--------------------------------------------------------------------
// Cached pointers to well known joints
//--------------------------------------------------------------------
public:
LLJoint* mPelvisp;
LLJoint* mTorsop;
LLJoint* mChestp;
LLJoint* mNeckp;
LLJoint* mHeadp;
LLJoint* mSkullp;
LLJoint* mEyeLeftp;
LLJoint* mEyeRightp;
LLJoint* mHipLeftp;
LLJoint* mHipRightp;
LLJoint* mKneeLeftp;
LLJoint* mKneeRightp;
LLJoint* mAnkleLeftp;
LLJoint* mAnkleRightp;
LLJoint* mFootLeftp;
LLJoint* mFootRightp;
LLJoint* mWristLeftp;
LLJoint* mWristRightp;
LLJoint* mPelvisp{nullptr};
LLJoint* mTorsop{ nullptr };
LLJoint* mChestp{ nullptr };
LLJoint* mNeckp{ nullptr };
LLJoint* mHeadp{ nullptr };
LLJoint* mSkullp{ nullptr };
LLJoint* mEyeLeftp{ nullptr };
LLJoint* mEyeRightp{ nullptr };
LLJoint* mHipLeftp{ nullptr };
LLJoint* mHipRightp{ nullptr };
LLJoint* mKneeLeftp{ nullptr };
LLJoint* mKneeRightp{ nullptr };
LLJoint* mAnkleLeftp{ nullptr };
LLJoint* mAnkleRightp{ nullptr };
LLJoint* mFootLeftp{ nullptr };
LLJoint* mFootRightp{ nullptr };
LLJoint* mWristLeftp{ nullptr };
LLJoint* mWristRightp{ nullptr };
//--------------------------------------------------------------------
// XML parse tree
@ -227,7 +227,7 @@ protected:
** RENDERING
**/
public:
bool mIsDummy; // for special views and animated object controllers; local to viewer
bool mIsDummy{ false }; // for special views and animated object controllers; local to viewer
//--------------------------------------------------------------------
// Morph masks
@ -290,9 +290,9 @@ public:
LLColor4 getGlobalColor(const std::string& color_name ) const;
virtual void onGlobalColorChanged(const LLTexGlobalColor* global_color) = 0;
protected:
LLTexGlobalColor* mTexSkinColor;
LLTexGlobalColor* mTexHairColor;
LLTexGlobalColor* mTexEyeColor;
LLTexGlobalColor* mTexSkinColor{ nullptr };
LLTexGlobalColor* mTexHairColor{ nullptr };
LLTexGlobalColor* mTexEyeColor{ nullptr };
//--------------------------------------------------------------------
// Visibility
@ -315,7 +315,7 @@ public:
virtual bool isWearingWearableType(LLWearableType::EType type ) const;
private:
LLWearableData* mWearableData;
LLWearableData* mWearableData{ nullptr };
/********************************************************************************
** **
@ -333,11 +333,11 @@ protected:
struct BakedTextureData
{
LLUUID mLastTextureID;
LLTexLayerSet* mTexLayerSet; // Only exists for self
bool mIsLoaded;
bool mIsUsed;
LLAvatarAppearanceDefines::ETextureIndex mTextureIndex;
U32 mMaskTexName;
LLTexLayerSet* mTexLayerSet{ nullptr }; // Only exists for self
bool mIsLoaded{ false };
bool mIsUsed{ false };
LLAvatarAppearanceDefines::ETextureIndex mTextureIndex{ LLAvatarAppearanceDefines::ETextureIndex::TEX_INVALID };
U32 mMaskTexName{ 0 };
// Stores pointers to the joint meshes that this baked texture deals with
avatar_joint_mesh_list_t mJointMeshes;
morph_list_t mMaskedMorphs;
@ -354,9 +354,9 @@ protected:
// Collision volumes
//--------------------------------------------------------------------
public:
S32 mNumBones;
S32 mNumCollisionVolumes;
LLAvatarJointCollisionVolume* mCollisionVolumes;
S32 mNumBones{ 0 };
S32 mNumCollisionVolumes{ 0 };
LLAvatarJointCollisionVolume* mCollisionVolumes{ nullptr };
protected:
bool allocateCollisionVolumes(U32 num);

6
indra/llappearance/lldriverparam.h
View File

@ -130,10 +130,10 @@ protected:
LL_ALIGN_16(LLVector4a mDefaultVec); // temp holder
entry_list_t mDriven;
LLViewerVisualParam* mCurrentDistortionParam;
LLViewerVisualParam* mCurrentDistortionParam{ nullptr };
// Backlink only; don't make this an LLPointer.
LLAvatarAppearance* mAvatarAppearance;
LLWearable* mWearablep;
LLAvatarAppearance* mAvatarAppearance{ nullptr };
LLWearable* mWearablep{ nullptr };
};
#endif // LL_LLDRIVERPARAM_H

2
indra/llcommon/llfasttimer.h
View File

@ -215,7 +215,7 @@ private:
private:
U64 mStartTime;
BlockTimerStackRecord mParentTimerData;
BlockTimerStackRecord mParentTimerData{};
public:
// statics

4
indra/llcommon/llfile.h
View File

@ -97,7 +97,7 @@ public:
// no copy
LLUniqueFile(const LLUniqueFile&) = delete;
// move construction
LLUniqueFile(LLUniqueFile&& other)
LLUniqueFile(LLUniqueFile&& other) noexcept
{
mFileHandle = other.mFileHandle;
other.mFileHandle = nullptr;
@ -118,7 +118,7 @@ public:
// copy assignment deleted
LLUniqueFile& operator=(const LLUniqueFile&) = delete;
// move assignment
LLUniqueFile& operator=(LLUniqueFile&& other)
LLUniqueFile& operator=(LLUniqueFile&& other) noexcept
{
close();
std::swap(mFileHandle, other.mFileHandle);

1
indra/llcommon/llsingleton.h
View File

@ -528,6 +528,7 @@ public:
classname<DERIVED_TYPE>(),
" -- creating new instance"});
// fall through
[[fallthrough]];
case UNINITIALIZED:
case QUEUED:
// QUEUED means some secondary thread has already requested an

6
indra/llcommon/lltraceaccumulators.h
View File

@ -522,9 +522,9 @@ namespace LLTrace
struct BlockTimerStackRecord
{
class BlockTimer* mActiveTimer;
class BlockTimerStatHandle* mTimeBlock;
U64 mChildTime;
class BlockTimer* mActiveTimer{ nullptr };
class BlockTimerStatHandle* mTimeBlock{ nullptr };
U64 mChildTime{ 0 };
};
struct AccumulatorBufferGroup : public LLRefCount

4
indra/llmath/llsimdtypes.h
View File

@ -60,7 +60,7 @@ public:
inline operator bool() const { return static_cast<const bool&>(m_bool); }
private:
int m_bool;
int m_bool{ 0 };
};
#if LL_WINDOWS
@ -118,7 +118,7 @@ public:
}
private:
LLQuad mQ;
LLQuad mQ{};
};
#endif //LL_SIMD_TYPES_H

2
indra/llmath/llvector4a.h
View File

@ -322,7 +322,7 @@ public:
inline operator LLQuad() const;
private:
LLQuad mQ;
LLQuad mQ{};
};
inline void update_min_max(LLVector4a& min, LLVector4a& max, const LLVector4a& p)

2
indra/llmath/llvector4logical.h
View File

@ -120,7 +120,7 @@ public:
private:
LLQuad mQ;
LLQuad mQ{};
};
#endif //LL_VECTOR4ALOGICAL_H

182
indra/llmessage/llregionflags.h
View File

@ -28,83 +28,83 @@
#define LL_LLREGIONFLAGS_H
// Can you be hurt here? Should health be on?
const U64 REGION_FLAGS_ALLOW_DAMAGE = (1 << 0);
constexpr U64 REGION_FLAGS_ALLOW_DAMAGE = (1ULL << 0);
// Can you make landmarks here?
const U64 REGION_FLAGS_ALLOW_LANDMARK = (1 << 1);
constexpr U64 REGION_FLAGS_ALLOW_LANDMARK = (1ULL << 1);
// Do we reset the home position when someone teleports away from here?
const U64 REGION_FLAGS_ALLOW_SET_HOME = (1 << 2);
constexpr U64 REGION_FLAGS_ALLOW_SET_HOME = (1ULL << 2);
// Do we reset the home position when someone teleports away from here?
const U64 REGION_FLAGS_RESET_HOME_ON_TELEPORT = (1 << 3);
constexpr U64 REGION_FLAGS_RESET_HOME_ON_TELEPORT = (1ULL << 3);
// Does the sun move?
const U64 REGION_FLAGS_SUN_FIXED = (1 << 4);
constexpr U64 REGION_FLAGS_SUN_FIXED = (1ULL << 4);
// Does the estate owner allow private parcels?
const U64 REGION_FLAGS_ALLOW_ACCESS_OVERRIDE = (1 << 5);
constexpr U64 REGION_FLAGS_ALLOW_ACCESS_OVERRIDE = (1ULL << 5);
// Can't change the terrain heightfield, even on owned parcels,
// but can plant trees and grass.
const U64 REGION_FLAGS_BLOCK_TERRAFORM = (1 << 6);
constexpr U64 REGION_FLAGS_BLOCK_TERRAFORM = (1ULL << 6);
// Can't release, sell, or buy land.
const U64 REGION_FLAGS_BLOCK_LAND_RESELL = (1 << 7);
constexpr U64 REGION_FLAGS_BLOCK_LAND_RESELL = (1ULL << 7);
// All content wiped once per night
const U64 REGION_FLAGS_SANDBOX = (1 << 8);
constexpr U64 REGION_FLAGS_SANDBOX = (1ULL << 8);
const U64 REGION_FLAGS_ALLOW_ENVIRONMENT_OVERRIDE = (1 << 9);
constexpr U64 REGION_FLAGS_ALLOW_ENVIRONMENT_OVERRIDE = (1ULL << 9);
const U64 REGION_FLAGS_SKIP_COLLISIONS = (1 << 12); // Pin all non agent rigid bodies
const U64 REGION_FLAGS_SKIP_SCRIPTS = (1 << 13);
const U64 REGION_FLAGS_SKIP_PHYSICS = (1 << 14); // Skip all physics
const U64 REGION_FLAGS_EXTERNALLY_VISIBLE = (1 << 15);
const U64 REGION_FLAGS_ALLOW_RETURN_ENCROACHING_OBJECT = (1 << 16);
const U64 REGION_FLAGS_ALLOW_RETURN_ENCROACHING_ESTATE_OBJECT = (1 << 17);
const U64 REGION_FLAGS_BLOCK_DWELL = (1 << 18);
constexpr U64 REGION_FLAGS_SKIP_COLLISIONS = (1ULL << 12); // Pin all non agent rigid bodies
constexpr U64 REGION_FLAGS_SKIP_SCRIPTS = (1ULL << 13);
constexpr U64 REGION_FLAGS_SKIP_PHYSICS = (1ULL << 14); // Skip all physics
constexpr U64 REGION_FLAGS_EXTERNALLY_VISIBLE = (1ULL << 15);
constexpr U64 REGION_FLAGS_ALLOW_RETURN_ENCROACHING_OBJECT = (1ULL << 16);
constexpr U64 REGION_FLAGS_ALLOW_RETURN_ENCROACHING_ESTATE_OBJECT = (1ULL << 17);
constexpr U64 REGION_FLAGS_BLOCK_DWELL = (1ULL << 18);
// Is flight allowed?
const U64 REGION_FLAGS_BLOCK_FLY = (1 << 19);
constexpr U64 REGION_FLAGS_BLOCK_FLY = (1ULL << 19);
// Is direct teleport (p2p) allowed?
const U64 REGION_FLAGS_ALLOW_DIRECT_TELEPORT = (1 << 20);
constexpr U64 REGION_FLAGS_ALLOW_DIRECT_TELEPORT = (1ULL << 20);
// Is there an administrative override on scripts in the region at the
// moment. This is the similar skip scripts, except this flag is
// presisted in the database on an estate level.
const U64 REGION_FLAGS_ESTATE_SKIP_SCRIPTS = (1 << 21);
constexpr U64 REGION_FLAGS_ESTATE_SKIP_SCRIPTS = (1ULL << 21);
const U64 REGION_FLAGS_RESTRICT_PUSHOBJECT = (1 << 22);
constexpr U64 REGION_FLAGS_RESTRICT_PUSHOBJECT = (1ULL << 22);
const U64 REGION_FLAGS_DENY_ANONYMOUS = (1 << 23);
constexpr U64 REGION_FLAGS_DENY_ANONYMOUS = (1ULL << 23);
const U64 REGION_FLAGS_ALLOW_PARCEL_CHANGES = (1 << 26);
constexpr U64 REGION_FLAGS_ALLOW_PARCEL_CHANGES = (1ULL << 26);
const U64 REGION_FLAGS_BLOCK_FLYOVER = (1 << 27);
constexpr U64 REGION_FLAGS_BLOCK_FLYOVER = (1ULL << 27);
const U64 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
constexpr U64 REGION_FLAGS_ALLOW_VOICE = (1ULL << 28);
const U64 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1 << 29);
const U64 REGION_FLAGS_DENY_AGEUNVERIFIED = (1 << 30);
constexpr U64 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1ULL << 29);
constexpr U64 REGION_FLAGS_DENY_AGEUNVERIFIED = (1ULL << 30);
const U64 REGION_FLAGS_DENY_BOTS = (1 << 31);
constexpr U64 REGION_FLAGS_DENY_BOTS = (1ULL << 31);
const U64 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
REGION_FLAGS_ALLOW_SET_HOME |
REGION_FLAGS_ALLOW_PARCEL_CHANGES |
REGION_FLAGS_ALLOW_VOICE;
constexpr U64 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
REGION_FLAGS_ALLOW_SET_HOME |
REGION_FLAGS_ALLOW_PARCEL_CHANGES |
REGION_FLAGS_ALLOW_VOICE;
const U64 REGION_FLAGS_PRELUDE_SET = REGION_FLAGS_RESET_HOME_ON_TELEPORT;
const U64 REGION_FLAGS_PRELUDE_UNSET = REGION_FLAGS_ALLOW_LANDMARK
| REGION_FLAGS_ALLOW_SET_HOME;
constexpr U64 REGION_FLAGS_PRELUDE_SET = REGION_FLAGS_RESET_HOME_ON_TELEPORT;
constexpr U64 REGION_FLAGS_PRELUDE_UNSET = REGION_FLAGS_ALLOW_LANDMARK |
REGION_FLAGS_ALLOW_SET_HOME;
const U64 REGION_FLAGS_ESTATE_MASK = REGION_FLAGS_EXTERNALLY_VISIBLE
| REGION_FLAGS_SUN_FIXED
| REGION_FLAGS_DENY_ANONYMOUS
| REGION_FLAGS_DENY_AGEUNVERIFIED;
constexpr U64 REGION_FLAGS_ESTATE_MASK = REGION_FLAGS_EXTERNALLY_VISIBLE |
REGION_FLAGS_SUN_FIXED |
REGION_FLAGS_DENY_ANONYMOUS |
REGION_FLAGS_DENY_AGEUNVERIFIED;
inline bool is_flag_set(U64 flags, U64 flag)
{
@ -133,79 +133,75 @@ inline U64 unset_prelude_flags(U64 flags)
}
// Region protocols
const U64 REGION_PROTOCOLS_AGENT_APPEARANCE_SERVICE = (1 << 0);
constexpr U64 REGION_PROTOCOLS_AGENT_APPEARANCE_SERVICE = (1ULL << 0);
// estate constants. Need to match first few etries in indra.estate table.
const U32 ESTATE_ALL = 0; // will not match in db, reserved key for logic
const U32 ESTATE_MAINLAND = 1;
const U32 ESTATE_ORIENTATION = 2;
const U32 ESTATE_INTERNAL = 3;
const U32 ESTATE_SHOWCASE = 4;
const U32 ESTATE_TEEN = 5;
const U32 ESTATE_LAST_LINDEN = 5; // last linden owned/managed estate
constexpr U32 ESTATE_ALL = 0; // will not match in db, reserved key for logic
constexpr U32 ESTATE_MAINLAND = 1;
constexpr U32 ESTATE_ORIENTATION = 2;
constexpr U32 ESTATE_INTERNAL = 3;
constexpr U32 ESTATE_SHOWCASE = 4;
constexpr U32 ESTATE_TEEN = 5;
constexpr U32 ESTATE_LAST_LINDEN = 5; // last linden owned/managed estate
// for EstateOwnerRequest, setaccess message
const U32 ESTATE_ACCESS_ALLOWED_AGENTS = 1 << 0;
const U32 ESTATE_ACCESS_ALLOWED_GROUPS = 1 << 1;
const U32 ESTATE_ACCESS_BANNED_AGENTS = 1 << 2;
const U32 ESTATE_ACCESS_MANAGERS = 1 << 3;
constexpr U32 ESTATE_ACCESS_ALLOWED_AGENTS = 1 << 0;
constexpr U32 ESTATE_ACCESS_ALLOWED_GROUPS = 1 << 1;
constexpr U32 ESTATE_ACCESS_BANNED_AGENTS = 1 << 2;
constexpr U32 ESTATE_ACCESS_MANAGERS = 1 << 3;
//maximum number of access list entries we can fit in one packet
const S32 ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET = 63;
constexpr S32 ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET = 63;
// for reply to "getinfo", don't need to forward to all sims in estate
const U32 ESTATE_ACCESS_SEND_TO_AGENT_ONLY = 1 << 4;
constexpr U32 ESTATE_ACCESS_SEND_TO_AGENT_ONLY = 1 << 4;
const U32 ESTATE_ACCESS_ALL = ESTATE_ACCESS_ALLOWED_AGENTS
| ESTATE_ACCESS_ALLOWED_GROUPS
| ESTATE_ACCESS_BANNED_AGENTS
| ESTATE_ACCESS_MANAGERS;
constexpr U32 ESTATE_ACCESS_ALL = ESTATE_ACCESS_ALLOWED_AGENTS
| ESTATE_ACCESS_ALLOWED_GROUPS
| ESTATE_ACCESS_BANNED_AGENTS
| ESTATE_ACCESS_MANAGERS;
// for EstateOwnerRequest, estateaccessdelta, estateexperiencedelta messages
const U32 ESTATE_ACCESS_APPLY_TO_ALL_ESTATES = 1U << 0;
const U32 ESTATE_ACCESS_APPLY_TO_MANAGED_ESTATES = 1U << 1;
constexpr U32 ESTATE_ACCESS_APPLY_TO_ALL_ESTATES = 1U << 0;
constexpr U32 ESTATE_ACCESS_APPLY_TO_MANAGED_ESTATES = 1U << 1;
const U32 ESTATE_ACCESS_ALLOWED_AGENT_ADD = 1U << 2;
const U32 ESTATE_ACCESS_ALLOWED_AGENT_REMOVE = 1U << 3;
const U32 ESTATE_ACCESS_ALLOWED_GROUP_ADD = 1U << 4;
const U32 ESTATE_ACCESS_ALLOWED_GROUP_REMOVE = 1U << 5;
const U32 ESTATE_ACCESS_BANNED_AGENT_ADD = 1U << 6;
const U32 ESTATE_ACCESS_BANNED_AGENT_REMOVE = 1U << 7;
const U32 ESTATE_ACCESS_MANAGER_ADD = 1U << 8;
const U32 ESTATE_ACCESS_MANAGER_REMOVE = 1U << 9;
const U32 ESTATE_ACCESS_NO_REPLY = 1U << 10;
const U32 ESTATE_ACCESS_FAILED_BAN_ESTATE_MANAGER = 1U << 11;
constexpr U32 ESTATE_ACCESS_ALLOWED_AGENT_ADD = 1U << 2;
constexpr U32 ESTATE_ACCESS_ALLOWED_AGENT_REMOVE = 1U << 3;
constexpr U32 ESTATE_ACCESS_ALLOWED_GROUP_ADD = 1U << 4;
constexpr U32 ESTATE_ACCESS_ALLOWED_GROUP_REMOVE = 1U << 5;
constexpr U32 ESTATE_ACCESS_BANNED_AGENT_ADD = 1U << 6;
constexpr U32 ESTATE_ACCESS_BANNED_AGENT_REMOVE = 1U << 7;
constexpr U32 ESTATE_ACCESS_MANAGER_ADD = 1U << 8;
constexpr U32 ESTATE_ACCESS_MANAGER_REMOVE = 1U << 9;
constexpr U32 ESTATE_ACCESS_NO_REPLY = 1U << 10;
constexpr U32 ESTATE_ACCESS_FAILED_BAN_ESTATE_MANAGER = 1U << 11;
const S32 ESTATE_MAX_MANAGERS = 20;
const S32 ESTATE_MAX_ACCESS_IDS = 500; // max for access
const S32 ESTATE_MAX_BANNED_IDS = 750; // max for banned
const S32 ESTATE_MAX_GROUP_IDS = (S32) ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET;
constexpr S32 ESTATE_MAX_MANAGERS = 20;
constexpr S32 ESTATE_MAX_ACCESS_IDS = 500; // max for access
constexpr S32 ESTATE_MAX_BANNED_IDS = 750; // max for banned
constexpr S32 ESTATE_MAX_GROUP_IDS = (S32) ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET;
// 'Sim Wide Delete' flags
const U32 SWD_OTHERS_LAND_ONLY = (1 << 0);
const U32 SWD_ALWAYS_RETURN_OBJECTS = (1 << 1);
const U32 SWD_SCRIPTED_ONLY = (1 << 2);
constexpr U32 SWD_OTHERS_LAND_ONLY = (1 << 0);
constexpr U32 SWD_ALWAYS_RETURN_OBJECTS = (1 << 1);
constexpr U32 SWD_SCRIPTED_ONLY = (1 << 2);
// Controls experience key validity in the estate
const U32 EXPERIENCE_KEY_TYPE_NONE = 0;
const U32 EXPERIENCE_KEY_TYPE_BLOCKED = 1;
const U32 EXPERIENCE_KEY_TYPE_ALLOWED = 2;
const U32 EXPERIENCE_KEY_TYPE_TRUSTED = 3;
constexpr U32 EXPERIENCE_KEY_TYPE_NONE = 0;
constexpr U32 EXPERIENCE_KEY_TYPE_BLOCKED = 1;
constexpr U32 EXPERIENCE_KEY_TYPE_ALLOWED = 2;
constexpr U32 EXPERIENCE_KEY_TYPE_TRUSTED = 3;
const U32 EXPERIENCE_KEY_TYPE_FIRST = EXPERIENCE_KEY_TYPE_BLOCKED;
const U32 EXPERIENCE_KEY_TYPE_LAST = EXPERIENCE_KEY_TYPE_TRUSTED;
constexpr U32 EXPERIENCE_KEY_TYPE_FIRST = EXPERIENCE_KEY_TYPE_BLOCKED;
constexpr U32 EXPERIENCE_KEY_TYPE_LAST = EXPERIENCE_KEY_TYPE_TRUSTED;
//
const U32 ESTATE_EXPERIENCE_TRUSTED_ADD = 1U << 2;
const U32 ESTATE_EXPERIENCE_TRUSTED_REMOVE = 1U << 3;
const U32 ESTATE_EXPERIENCE_ALLOWED_ADD = 1U << 4;
const U32 ESTATE_EXPERIENCE_ALLOWED_REMOVE = 1U << 5;
const U32 ESTATE_EXPERIENCE_BLOCKED_ADD = 1U << 6;
const U32 ESTATE_EXPERIENCE_BLOCKED_REMOVE = 1U << 7;
const S32 ESTATE_MAX_EXPERIENCE_IDS = 8;
constexpr U32 ESTATE_EXPERIENCE_TRUSTED_ADD = 1U << 2;
constexpr U32 ESTATE_EXPERIENCE_TRUSTED_REMOVE = 1U << 3;
constexpr U32 ESTATE_EXPERIENCE_ALLOWED_ADD = 1U << 4;
constexpr U32 ESTATE_EXPERIENCE_ALLOWED_REMOVE = 1U << 5;
constexpr U32 ESTATE_EXPERIENCE_BLOCKED_ADD = 1U << 6;
constexpr U32 ESTATE_EXPERIENCE_BLOCKED_REMOVE = 1U << 7;
constexpr S32 ESTATE_MAX_EXPERIENCE_IDS = 8;
#endif

2
indra/llprimitive/llmodel.h
View File

@ -357,7 +357,7 @@ public:
protected:
LLUUID mDiffuseMapID;
void* mOpaqueData; // allow refs to viewer/platform-specific structs for each material
void* mOpaqueData{ nullptr }; // allow refs to viewer/platform-specific structs for each material
// currently only stores an LLPointer< LLViewerFetchedTexture > > to
// maintain refs to textures associated with each material for free
// ref counting.

4
indra/llrender/llglslshader.h
View File

@ -68,8 +68,8 @@ public:
template<typename T>
struct UniformSetting
{
S32 mUniform;
T mValue;
S32 mUniform{ 0 };
T mValue{};
};
typedef UniformSetting<S32> IntSetting;

6
indra/llui/lltoolbar.h
View File

@ -178,12 +178,12 @@ public:
protected:
friend class LLUICtrlFactory;
LLCenterLayoutPanel(const Params& params) : LLLayoutPanel(params), mButtonPanel(NULL) {}
LLCenterLayoutPanel(const Params& params) : LLLayoutPanel(params) {};
private:
reshape_callback_t mReshapeCallback;
LLToolBarEnums::EToolBarLocation mLocationId;
LLPanel * mButtonPanel;
LLToolBarEnums::EToolBarLocation mLocationId{ LLToolBarEnums::EToolBarLocation::TOOLBAR_NONE };
LLPanel * mButtonPanel{ nullptr };
};
struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>

2
indra/llui/llui.h
View File

@ -234,7 +234,7 @@ public:
private:
S32 mValue;
S32 mValue{ 0 };
};
//