diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llhudeffectlookat.h | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llhudeffectlookat.h')
| -rw-r--r-- | indra/newview/llhudeffectlookat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llhudeffectlookat.h b/indra/newview/llhudeffectlookat.h index fd057715b6..6d928213a4 100644 --- a/indra/newview/llhudeffectlookat.h +++ b/indra/newview/llhudeffectlookat.h @@ -57,7 +57,7 @@ public: /*virtual*/ void markDead(); /*virtual*/ void setSourceObject(LLViewerObject* objectp); - BOOL setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position); + bool setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position); void clearLookAtTarget(); ELookAtType getLookAtType() { return mTargetType; } @@ -79,7 +79,7 @@ protected: void setTargetPosGlobal(const LLVector3d &target_pos_global); public: - static BOOL sDebugLookAt; + static bool sDebugLookAt; private: ELookAtType mTargetType; |