summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-04-30 16:47:06 -0700
committerRider Linden <rider@lindenlab.com>2018-04-30 16:47:06 -0700
commit081d90c98950a083ba4466fbb3a91b8c6a1ed5e2 (patch)
tree4cfbdd6afb255cd6bdd2fe2fa5685668c2a23e98
parent438609699b838924becee89fa9d8ec83552f3236 (diff)
Refresh is defined in LLPanel. Must be marked override here also
-rw-r--r--indra/newview/llfloaterfixedenvironment.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h
index 9eb03e0b3a..be1ba4a58b 100644
--- a/indra/newview/llfloaterfixedenvironment.h
+++ b/indra/newview/llfloaterfixedenvironment.h
@@ -54,7 +54,7 @@ public:
protected:
virtual void updateEditEnvironment() = 0;
- virtual void refresh();
+ virtual void refresh() override;
virtual void syncronizeTabs();
@@ -176,7 +176,7 @@ class LLSettingsEditPanel : public LLPanel
public:
virtual void setSettings(LLSettingsBase::ptr_t &) = 0;
- virtual void refresh() = 0;
+// virtual void refresh() override;
protected:
LLSettingsEditPanel() :