diff options
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llfloateremojipicker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp index df973a15b5..a9bc0fd6bb 100644 --- a/indra/newview/llfloateremojipicker.cpp +++ b/indra/newview/llfloateremojipicker.cpp @@ -279,7 +279,7 @@ void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t } LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key) -: LLFloater(key) +: super(key) { loadState(); } @@ -894,14 +894,14 @@ BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask) } } - return LLFloater::handleKeyHere(key, mask); + return super::handleKeyHere(key, mask); } // virtual void LLFloaterEmojiPicker::closeFloater(bool app_quitting) { saveState(); - LLFloater::closeFloater(app_quitting); + super::closeFloater(app_quitting); if (mFloaterCloseCallback) { mFloaterCloseCallback(); |