summaryrefslogtreecommitdiff
path: root/indra/newview/llhudeffectpointat.h
diff options
context:
space:
mode:
authorBrad Linden <46733234+brad-linden@users.noreply.github.com>2024-05-06 15:44:19 -0700
committerGitHub <noreply@github.com>2024-05-06 15:44:19 -0700
commit84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch)
treeb91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llhudeffectpointat.h
parent76101843c0d390c25a783f212eb1ea75e508ada4 (diff)
parent8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff)
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llhudeffectpointat.h')
-rw-r--r--indra/newview/llhudeffectpointat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llhudeffectpointat.h b/indra/newview/llhudeffectpointat.h
index 6200b68cbc..8ce7b33c6f 100644
--- a/indra/newview/llhudeffectpointat.h
+++ b/indra/newview/llhudeffectpointat.h
@@ -50,7 +50,7 @@ public:
/*virtual*/ void markDead();
/*virtual*/ void setSourceObject(LLViewerObject* objectp);
- BOOL setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position);
+ bool setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position);
void clearPointAtTarget();
EPointAtType getPointAtType() { return mTargetType; }
@@ -70,7 +70,7 @@ protected:
bool calcTargetPosition();
void update();
public:
- static BOOL sDebugPointAt;
+ static bool sDebugPointAt;
private:
EPointAtType mTargetType;
LLVector3d mTargetOffsetGlobal;