diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-06-13 14:59:28 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-06-13 14:59:28 -0700 |
| commit | 5e60392c273f0c9c5efa765a05414c618381780a (patch) | |
| tree | d1eedbb1dfa86e66532a6d8746b7a81e5a444d3a /indra/newview/llviewerparceloverlay.h | |
| parent | 0f3c3563b0861e8ea82b201aab8343d99f993bbc (diff) | |
| parent | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (diff) | |
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llviewerparceloverlay.h')
| -rw-r--r-- | indra/newview/llviewerparceloverlay.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewerparceloverlay.h b/indra/newview/llviewerparceloverlay.h index 7587dbb826..d78005e376 100644 --- a/indra/newview/llviewerparceloverlay.h +++ b/indra/newview/llviewerparceloverlay.h @@ -50,10 +50,10 @@ public: // ACCESS LLViewerTexture* getTexture() const { return mTexture; } - BOOL isOwned(const LLVector3& pos) const; - BOOL isOwnedSelf(const LLVector3& pos) const; - BOOL isOwnedGroup(const LLVector3& pos) const; - BOOL isOwnedOther(const LLVector3& pos) const; + bool isOwned(const LLVector3& pos) const; + bool isOwnedSelf(const LLVector3& pos) const; + bool isOwnedGroup(const LLVector3& pos) const; + bool isOwnedOther(const LLVector3& pos) const; // "encroaches" means the prim hangs over the parcel, but its center // might be in another parcel. for now, we simply test axis aligned @@ -62,9 +62,9 @@ public: bool encroachesOnUnowned(const std::vector<LLBBox>& boxes) const; bool encroachesOnNearbyParcel(const std::vector<LLBBox>& boxes) const; - BOOL isSoundLocal(const LLVector3& pos) const; + bool isSoundLocal(const LLVector3& pos) const; - BOOL isBuildCameraAllowed(const LLVector3& pos) const; + bool isBuildCameraAllowed(const LLVector3& pos) const; F32 getOwnedRatio() const; // Returns the number of vertices drawn @@ -112,7 +112,7 @@ private: U8 *mOwnership; // Update propery lines and overlay texture - BOOL mDirty; + bool mDirty; LLFrameTimer mTimeSinceLastUpdate; S32 mOverlayTextureIdx; |