diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-10 20:03:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 20:03:54 +0300 |
| commit | f74c10c4ec6435471bac84473fe865f90843c2df (patch) | |
| tree | b2853d87789dbb84d6c26c259eab6639d3a7e482 /indra/newview/llpathfindingmanager.cpp | |
| parent | 5fccb539937a52d286274a002266e022e2102e5e (diff) | |
| parent | 32fcefc058ae38eff0572326ef3efd1c7b343144 (diff) | |
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
Diffstat (limited to 'indra/newview/llpathfindingmanager.cpp')
| -rw-r--r-- | indra/newview/llpathfindingmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp index 7b7caa5a79..5e7bc4fb3b 100644 --- a/indra/newview/llpathfindingmanager.cpp +++ b/indra/newview/llpathfindingmanager.cpp @@ -363,7 +363,7 @@ void LLPathfindingManager::requestGetAgentState() if (currentRegion == NULL) { - mAgentStateSignal(FALSE); + mAgentStateSignal(false); } else { @@ -373,7 +373,7 @@ void LLPathfindingManager::requestGetAgentState() } else if (!isPathfindingEnabledForRegion(currentRegion)) { - mAgentStateSignal(FALSE); + mAgentStateSignal(false); } else { @@ -708,7 +708,7 @@ void LLPathfindingManager::handleNavMeshStatusUpdate(const LLPathfindingNavMeshS } } -void LLPathfindingManager::handleAgentState(BOOL pCanRebakeRegion) +void LLPathfindingManager::handleAgentState(bool pCanRebakeRegion) { mAgentStateSignal(pCanRebakeRegion); } @@ -831,7 +831,7 @@ void LLAgentStateChangeNode::post(ResponsePtr pResponse, const LLSD &pContext, c llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).isMap()); llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).has(AGENT_STATE_CAN_REBAKE_REGION_FIELD)); llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).get(AGENT_STATE_CAN_REBAKE_REGION_FIELD).isBoolean()); - BOOL canRebakeRegion = pInput.get(SIM_MESSAGE_BODY_FIELD).get(AGENT_STATE_CAN_REBAKE_REGION_FIELD).asBoolean(); + bool canRebakeRegion = pInput.get(SIM_MESSAGE_BODY_FIELD).get(AGENT_STATE_CAN_REBAKE_REGION_FIELD).asBoolean(); LLPathfindingManager::getInstance()->handleAgentState(canRebakeRegion); } |