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') 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