diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
| commit | c6d752b880cacca8fb8f10f28790a50161fcb9ab (patch) | |
| tree | 14910a69597962134f2e78e864a2f05962a16356 /indra/newview/llhudeffectpointat.h | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 7d87e41bbd5d4761b1eb17e49b7a00b948d84213 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
Diffstat (limited to 'indra/newview/llhudeffectpointat.h')
| -rw-r--r-- | indra/newview/llhudeffectpointat.h | 4 |
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; |