diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-16 12:04:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-16 12:04:56 +0300 |
commit | 7ede65bd22ca58253348335fe0d3b489b136ec5e (patch) | |
tree | 78681b7988bdd672759aba85193ae8dc7692a1d1 /indra/newview/llagent.cpp | |
parent | 7547530ad1ff176513701fd4337ff0ce6569fac4 (diff) | |
parent | 401f7eecb5c011a330046ac125ce14562de7ab5e (diff) |
Merge pull request #2862 from Ansariel/marchcat/c-develop
Fix various merge issues
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 4b758396de..6d03fdd61f 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -5028,7 +5028,7 @@ void LLAgent::applyExternalActionFlags(U32 outer_flags) if( delta_time > FLY_TIME && delta_frames > FLY_FRAMES) { - setFlying(TRUE); + setFlying(true); } } } |