summaryrefslogtreecommitdiff
path: root/indra/newview/llgesturemgr.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2023-03-31 11:57:48 -0500
committerDave Parks <davep@lindenlab.com>2023-03-31 11:57:48 -0500
commit7d144fcb2a1b0aff1b59e378c652649c3d03e94f (patch)
treede3bfe3ce90677cc4d7ab25b8aeaf5853c009068 /indra/newview/llgesturemgr.cpp
parent0fe09bd968b987605123e99efb2fa040a988a942 (diff)
parente4173ea5cc1ef9b1677ac87a0f7c8acbe73414ee (diff)
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
-rw-r--r--indra/newview/llgesturemgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index 489d34edca..c0f773968d 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -757,11 +757,11 @@ S32 LLGestureMgr::getPlayingCount() const
}
-struct IsGesturePlaying : public std::unary_function<LLMultiGesture*, bool>
+struct IsGesturePlaying
{
bool operator()(const LLMultiGesture* gesture) const
{
- return gesture->mPlaying ? true : false;
+ return bool(gesture->mPlaying);
}
};