summaryrefslogtreecommitdiff
path: root/indra/newview/llgesturemgr.h
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-03-02 08:55:04 +0800
committerErik Kundiman <erik@megapahit.org>2024-03-02 08:55:04 +0800
commit64a181fdde219328560eee0ff5b87f02ba36a65f (patch)
tree285437f75513ef47639ee9f3f8d47a5dc1b0ef8c /indra/newview/llgesturemgr.h
parent60592ae0d7a98e071e516fcac70c5bf1427f20be (diff)
parent1204468415dd5248bbd01d7aaede520ede3b9d36 (diff)
Merge tag '7.1.3-release'
source for viewer 7.1.3.7878383867
Diffstat (limited to 'indra/newview/llgesturemgr.h')
-rw-r--r--indra/newview/llgesturemgr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index 7c8e8279c2..7bb60f00e2 100644
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -135,7 +135,7 @@ public:
void notifyObservers();
// Overriding so we can update active gesture names and notify observers
- void changed(U32 mask);
+ void changed(U32 mask) override;
BOOL matchPrefix(const std::string& in_str, std::string* out_str);
@@ -150,7 +150,7 @@ protected:
void runStep(LLMultiGesture* gesture, LLGestureStep* step);
// LLInventoryCompletionObserver trigger
- void done();
+ void done() override;
// Used by loadGesture
static void onLoadComplete(const LLUUID& asset_uuid,