diff options
| author | Sam Kolb <skolb@lindenlab.com> | 2007-08-30 22:11:52 +0000 |
|---|---|---|
| committer | Sam Kolb <skolb@lindenlab.com> | 2007-08-30 22:11:52 +0000 |
| commit | b2595c369f78b6613e329274f5ca7c43c4ddeda0 (patch) | |
| tree | 4db6ae8237692b570b6e5dad489f3da24c5aa3fe /indra/newview/llpanelavatar.cpp | |
| parent | 84ea29c69c320573c7547f028b5325382e195cc6 (diff) | |
Merge sl-search-opt-in back into the release branch
Reviewed by Josh and Don
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index ab2e30014d..e0f19c10d1 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -1836,11 +1836,6 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) allow_publish = (flags & AVATAR_ALLOW_PUBLISH); online = (flags & AVATAR_ONLINE); - EOnlineStatus online_status = (online) ? ONLINE_STATUS_YES : ONLINE_STATUS_NO; - - self->setOnlineStatus(online_status); - - self->mPanelWeb->setWebURL(std::string(profile_url)); U8 caption_index = 0; LLString caption_text; charter_member_size = msg->getSize("PropertiesData", "CharterMember"); @@ -1855,12 +1850,6 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) caption_text = caption; } - LLTextureCtrl* image_ctrl = LLUICtrlFactory::getTexturePickerByName(self->mPanelSecondLife,"img"); - if(image_ctrl) - { - image_ctrl->setImageAssetID(image_id); - } - self->childSetValue("about", about_text); if(caption_text.empty()) { @@ -1903,10 +1892,23 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) self->mPanelSecondLife->childSetValue("acct", caption_text); self->mPanelSecondLife->childSetValue("born", born_on); - + + EOnlineStatus online_status = (online) ? ONLINE_STATUS_YES : ONLINE_STATUS_NO; + + self->setOnlineStatus(online_status); + + self->mPanelWeb->setWebURL(std::string(profile_url)); + + LLTextureCtrl* image_ctrl = LLUICtrlFactory::getTexturePickerByName(self->mPanelSecondLife,"img"); + if(image_ctrl) + { + image_ctrl->setImageAssetID(image_id); + } + self->childSetValue("about", about_text); + self->mPanelSecondLife->setPartnerID(partner_id); self->mPanelSecondLife->updatePartnerName(); - + if (self->mPanelFirstLife) { // Teens don't get these |