Renable old feature: Display complete names on profiles
This commit is contained in:
@@ -81,8 +81,10 @@ void LLNameUI::setNameText()
|
||||
}
|
||||
else
|
||||
{
|
||||
got_name = LLAvatarNameCache::getNSName(mNameID, name);
|
||||
if (!got_name)
|
||||
LLAvatarName av_name;
|
||||
if (got_name = LLAvatarNameCache::get(mNameID, &av_name))
|
||||
name = mShowCompleteName ? av_name.getCompleteName() : av_name.getNSName();
|
||||
else
|
||||
mConnection = LLAvatarNameCache::get(mNameID, boost::bind(&LLNameUI::setNameText, this));
|
||||
}
|
||||
|
||||
|
||||
@@ -56,6 +56,8 @@ struct LLNameUI : public LFIDBearer
|
||||
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 setShowCompleteName(bool show) { mShowCompleteName = show; }
|
||||
|
||||
virtual void setText(const std::string& text) = 0;
|
||||
|
||||
// Take either UUID or a map of "id" to UUID and "group" to boolean
|
||||
@@ -72,6 +74,7 @@ struct LLNameUI : public LFIDBearer
|
||||
private:
|
||||
static std::set<LLNameUI*> sInstances;
|
||||
boost::signals2::connection mConnection;
|
||||
bool mShowCompleteName = false;
|
||||
|
||||
protected:
|
||||
LLUUID mNameID;
|
||||
|
||||
@@ -1280,6 +1280,7 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id)
|
||||
if (LLDropTarget* drop_target = findChild<LLDropTarget>("drop_target_rect"))
|
||||
drop_target->setEntityID(mAvatarID);
|
||||
|
||||
dnname->setShowCompleteName(gSavedSettings.getBOOL("SinguCompleteNameProfiles"));
|
||||
|
||||
if (auto key_edit = getChildView("avatar_key"))
|
||||
key_edit->setValue(mAvatarID.asString());
|
||||
|
||||
Reference in New Issue
Block a user