diff options
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 866669f326..83beae29c1 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -133,7 +133,6 @@ private: LLUUID mAvatarID; // Need avatar name information to spawn friend add request std::string mAvatarName; - LLUUID mPartnerID; // an in-flight request for avatar properties from LLAvatarPropertiesProcessor // is represented by this object LLFetchAvatarData* mPropertiesRequest; @@ -187,8 +186,7 @@ public: LLInspectAvatar::LLInspectAvatar(const LLSD& sd) : LLInspect( LLSD() ), // single_instance, doesn't really need key - mAvatarID(), // set in onOpen() - mPartnerID(), + mAvatarID(), // set in onOpen() *Note: we used to show partner's name but we dont anymore --angela 3rd Dec* mAvatarName(), mPropertiesRequest(NULL) { @@ -257,7 +255,6 @@ void LLInspectAvatar::onOpen(const LLSD& data) // Extract appropriate avatar id mAvatarID = data["avatar_id"]; - mPartnerID = LLUUID::null; BOOL self = mAvatarID == gAgent.getID(); @@ -307,7 +304,6 @@ void LLInspectAvatar::requestUpdate() getChild<LLUICtrl>("user_name")->setValue(""); getChild<LLUICtrl>("user_subtitle")->setValue(""); getChild<LLUICtrl>("user_details")->setValue(""); - getChild<LLUICtrl>("user_partner")->setValue(""); // Make a new request for properties delete mPropertiesRequest; @@ -365,15 +361,6 @@ void LLInspectAvatar::processAvatarData(LLAvatarData* data) std::string details = getString("Details", args); getChild<LLUICtrl>("user_details")->setValue( LLSD(details) ); - // Look up partner name, if there is one - mPartnerID = data->partner_id; - if (mPartnerID.notNull()) - { - gCacheName->get(mPartnerID, FALSE, - boost::bind(&LLInspectAvatar::nameUpdatedCallback, - this, _1, _2, _3, _4)); - } - // Delete the request object as it has been satisfied delete mPropertiesRequest; mPropertiesRequest = NULL; @@ -455,15 +442,6 @@ void LLInspectAvatar::nameUpdatedCallback( mAvatarName = first + " " + last; childSetValue("user_name", LLSD(mAvatarName) ); } - - if (id == mPartnerID) - { - LLStringUtil::format_map_t args; - args["[PARTNER]"] = first + " " + last; - std::string partner = getString("Partner", args); - getChild<LLUICtrl>("user_partner")->setValue(partner); - } - // Otherwise possibly a request for an older inspector, ignore it } void LLInspectAvatar::onClickAddFriend() |