diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-11-16 07:01:11 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-11-16 07:01:11 -0800 |
| commit | 807007649a32c5276f31c5f73d6fade7d059ce07 (patch) | |
| tree | 5730fa254ab3938a2acd4329921a57a551018ad1 /indra/newview/llpanelavatar.cpp | |
| parent | 92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (diff) | |
| parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 68ca65420a..57180f63b5 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -44,7 +44,7 @@ #include "llfloaterreg.h" #include "llnotificationsutil.h" #include "llvoiceclient.h" -#include "llnamebox.h" +#include "lltextbox.h" #include "lltrans.h" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -218,13 +218,8 @@ void LLPanelAvatarNotes::rightsConfirmationCallback(const LLSD& notification, void LLPanelAvatarNotes::confirmModifyRights(bool grant, S32 rights) { - std::string first, last; LLSD args; - if (gCacheName->getName(getAvatarId(), first, last)) - { - args["FIRST_NAME"] = first; - args["LAST_NAME"] = last; - } + args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString(); if (grant) { @@ -562,8 +557,7 @@ void LLPanelAvatarProfile::resetData() getChild<LLUICtrl>("homepage_edit")->setValue(LLStringUtil::null); getChild<LLUICtrl>("register_date")->setValue(LLStringUtil::null); getChild<LLUICtrl>("acc_status_text")->setValue(LLStringUtil::null); - getChild<LLUICtrl>("partner_text")->setTextArg("[FIRST]", LLStringUtil::null); - getChild<LLUICtrl>("partner_text")->setTextArg("[LAST]", LLStringUtil::null); + getChild<LLUICtrl>("partner_text")->setValue(LLStringUtil::null); } void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType type) @@ -654,15 +648,14 @@ void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data) void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data) { - LLNameBox* name_box = getChild<LLNameBox>("partner_text"); + LLTextBox* partner_text = getChild<LLTextBox>("partner_text"); if (avatar_data->partner_id.notNull()) { - name_box->setNameID(avatar_data->partner_id, FALSE); + partner_text->setText(LLSLURL("agent", avatar_data->partner_id, "inspect").getSLURLString()); } else { - name_box->setNameID(LLUUID::null, FALSE); - name_box->setText(getString("no_partner_text")); + partner_text->setText(getString("no_partner_text")); } } |