diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index 304cd7eb22..7c2ebef252 100755 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -622,12 +622,12 @@ std::string LLCacheName::buildLegacyName(const std::string& complete_name) legacy_name = legacy_name + " " + cap_letter + last_name.substr(1); } // FIRE-6659: Legacy "Resident" name toggle - else if (!LLAvatarName::trimResidentSurname) + else if (!LLAvatarName::trimResidentSurname()) { legacy_name.append(" Resident"); } } - else if (!LLAvatarName::trimResidentSurname) + else if (!LLAvatarName::trimResidentSurname()) { legacy_name.append(" Resident"); // FIRE-6659: Legacy "Resident" name toggle @@ -1045,7 +1045,7 @@ void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup) if (entry->mLastName.empty()) { // FIRE-6659: Legacy "Resident" name toggle - if (!LLAvatarName::trimResidentSurname) + if (!LLAvatarName::trimResidentSurname()) { // FIRE-6659: Legacy "Resident" name toggle full_name = cleanFullName(entry->mFirstName);