From 1a21ce62c225dfc8f2671691929a3b1a9bc73726 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Wed, 6 Jan 2010 18:17:31 +0200 Subject: =?UTF-8?q?fixed=20EXT-3838=20=E2=80=9C[BSI]=20Resident=20profile?= =?UTF-8?q?=20tries=20to=20link=20"(none)"=20when=20Resident=20isn't=20mem?= =?UTF-8?q?ber=20of=20any=20groups=E2=80=9D,=20avoided=20translating=20nul?= =?UTF-8?q?l=20group=20id=20as=20SLURL;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llpanelavatar.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelavatar.cpp') diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index f3d6dbbb46..d14bdc5ab5 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -594,8 +594,10 @@ void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_g if (it != mGroups.begin()) groups += ", "; - - std::string group_url="[secondlife:///app/group/" + it->second.asString() + "/about " + it->first + "]"; + std::string group_url= it->second.notNull() + ? "[secondlife:///app/group/" + it->second.asString() + "/about " + it->first + "]" + : getString("no_partner_text"); + groups += group_url; } -- cgit v1.2.3 From 86b78d84bc95017fe3060bc1cca994858159ca7a Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Mon, 11 Jan 2010 13:59:32 +0200 Subject: added no_group_text string to the profile panel; --HG-- branch : product-engine --- indra/newview/llpanelavatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelavatar.cpp') diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index d14bdc5ab5..a55979bb89 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -596,7 +596,7 @@ void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_g std::string group_url= it->second.notNull() ? "[secondlife:///app/group/" + it->second.asString() + "/about " + it->first + "]" - : getString("no_partner_text"); + : getString("no_group_text"); groups += group_url; } -- cgit v1.2.3 From 85467c0ba654e2a787b216b89807e10fe1b078d8 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Tue, 12 Jan 2010 17:27:36 +0200 Subject: Fixed major bug EXT-4121 ([BSI] Partner display is blank for residents on your friends list, on the first lookup after login) --HG-- branch : product-engine --- indra/newview/llpanelavatar.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'indra/newview/llpanelavatar.cpp') diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 6c0a3880fa..85e95ca1d6 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -52,6 +52,7 @@ #include "llfloaterreg.h" #include "llnotificationsutil.h" #include "llvoiceclient.h" +#include "llnamebox.h" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLDropTarget @@ -624,19 +625,15 @@ void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data) void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data) { + LLNameBox* name_box = getChild("partner_text"); if (avatar_data->partner_id.notNull()) { - std::string first, last; - BOOL found = gCacheName->getName(avatar_data->partner_id, first, last); - if (found) - { - childSetTextArg("partner_text", "[FIRST]", first); - childSetTextArg("partner_text", "[LAST]", last); - } + name_box->setNameID(avatar_data->partner_id, FALSE); } else { - childSetTextArg("partner_text", "[FIRST]", getString("no_partner_text")); + name_box->setNameID(LLUUID::null, FALSE); + name_box->setText(getString("no_partner_text")); } } -- cgit v1.2.3