diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-04-14 09:05:14 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-04-14 09:05:14 -0700 |
| commit | 8dad411e9055c32a753e575ccd6142073eb27aae (patch) | |
| tree | 83876f1296010b1c6239539a0da4c6d43ef8f8de | |
| parent | ff7ebf08922293c1623b7bdb8c9923c14fc9db48 (diff) | |
SL-19575: Emoji gallery - couple of tweaks that mac Clang got sad about
| -rw-r--r-- | indra/newview/llfloateremojipicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp index c828a95a59..a63a9fac4f 100644 --- a/indra/newview/llfloateremojipicker.cpp +++ b/indra/newview/llfloateremojipicker.cpp @@ -91,14 +91,14 @@ LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key) BOOL LLFloaterEmojiPicker::postBuild() { - if (mEmojis = getChild<LLScrollListCtrl>("Emojis")) + if ((mEmojis = getChild<LLScrollListCtrl>("Emojis"))) { mEmojis->setDoubleClickCallback(boost::bind(&LLFloaterEmojiPicker::onSelect, this)); mEmojis->clearRows(); const std::map<llwchar, const LLEmojiDescriptor*>& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr(); - for (const std::pair<llwchar, const LLEmojiDescriptor*>& it : emoji2Descr) + for (const std::pair<const llwchar, const LLEmojiDescriptor*>& it : emoji2Descr) { LLScrollListItem::Params params; params.columns.add().column("name").value(it.second->Name); |