summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermap.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-08-28 20:47:43 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-08-28 20:47:43 -0400
commitcde1174345224d33d6b45b1e3243fa39043223e5 (patch)
tree6c8db6e0499622d8c7206a11c997eb173ebd478f /indra/newview/llfloatermap.h
parent6f454ad8366ed33bbe199c3fc3ed69e6d3448cec (diff)
parent35efadf78315f9b351415930dca4fae251ef4dd0 (diff)
Merge branch 'main' into release/luau-scripting.
Diffstat (limited to 'indra/newview/llfloatermap.h')
-rw-r--r--indra/newview/llfloatermap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h
index 333424ba71..1955372567 100644
--- a/indra/newview/llfloatermap.h
+++ b/indra/newview/llfloatermap.h
@@ -42,10 +42,10 @@ public:
static LLFloaterMap* getInstance();
virtual ~LLFloaterMap();
- /*virtual*/ BOOL postBuild();
- /*virtual*/ BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
- /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
- /*virtual*/ void draw();
+ bool postBuild() override;
+ bool handleDoubleClick( S32 x, S32 y, MASK mask ) override;
+ void reshape(S32 width, S32 height, bool called_from_parent = true) override;
+ void draw() override;
private:
void setDirectionPos( LLTextBox* text_box, F32 rotation );