diff --git a/indra/newview/llnameui.cpp b/indra/newview/llnameui.cpp index dcdf2de41..e411c6e99 100644 --- a/indra/newview/llnameui.cpp +++ b/indra/newview/llnameui.cpp @@ -123,7 +123,7 @@ void LLNameUI::setNameText() setText(got_name ? name : mInitialValue); } -void LLNameUI::refresh(const LLUUID& id, const std::string& full_name, bool is_group) +void LLNameUI::refresh(const LLUUID& id, const std::string& full_name) { if (id == mNameID) { @@ -131,12 +131,11 @@ void LLNameUI::refresh(const LLUUID& id, const std::string& full_name, bool is_g } } -void LLNameUI::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group) +void LLNameUI::refreshAll(const LLUUID& id, const std::string& full_name) { - if (!is_group) return; for (auto box : sInstances) { - box->refresh(id, full_name, is_group); + box->refresh(id, full_name); } } diff --git a/indra/newview/llnameui.h b/indra/newview/llnameui.h index 842f79712..146f3bf97 100644 --- a/indra/newview/llnameui.h +++ b/indra/newview/llnameui.h @@ -54,8 +54,8 @@ struct LLNameUI : public LFIDBearer void setIsGroup(bool is_group); void setNameID(const LLUUID& name_id, bool is_group); void setNameText(); // Sets the name to whatever the name cache has at the moment - void refresh(const LLUUID& id, const std::string& full_name, bool is_group); - static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group); + void refresh(const LLUUID& id, const std::string& name); + static void refreshAll(const LLUUID& id, const std::string& name); void showProfile(); diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index add23140c..de8dcd4f6 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -319,7 +319,7 @@ void transition_back_to_login_panel(const std::string& emsg); void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group) { - LLNameUI::refreshAll(id, full_name, is_group); + LLNameUI::refreshAll(id, full_name); // TODO: Actually be intelligent about the refresh. // For now, just brute force refresh the dialogs.