Skip to content
Snippets Groups Projects
Commit 149c56ae authored by Mike Antipov's avatar Mike Antipov
Browse files

Related to normal bug EXT-3880 ( [BSI] functionality loss - online status in profile)

-- removed logic to process online status (LLPanelAvatarProfile::fillOnlineStatus) for non-existent view (name="online_status") on profile page

--HG--
branch : product-engine
parent 74b3c9e0
No related branches found
No related tags found
No related merge requests found
...@@ -584,8 +584,6 @@ void LLPanelAvatarProfile::processProfileProperties(const LLAvatarData* avatar_d ...@@ -584,8 +584,6 @@ void LLPanelAvatarProfile::processProfileProperties(const LLAvatarData* avatar_d
fillPartnerData(avatar_data); fillPartnerData(avatar_data);
fillOnlineStatus(avatar_data);
fillAccountStatus(avatar_data); fillAccountStatus(avatar_data);
} }
...@@ -653,21 +651,6 @@ void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data) ...@@ -653,21 +651,6 @@ void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data)
} }
} }
void LLPanelAvatarProfile::fillOnlineStatus(const LLAvatarData* avatar_data)
{
bool online = avatar_data->flags & AVATAR_ONLINE;
if(LLAvatarActions::isFriend(avatar_data->avatar_id))
{
// Online status NO could be because they are hidden
// If they are a friend, we may know the truth!
online = LLAvatarTracker::instance().isBuddyOnline(avatar_data->avatar_id);
}
childSetValue("online_status", online ?
"Online" : "Offline");
childSetColor("online_status", online ?
LLColor4::green : LLColor4::red);
}
void LLPanelAvatarProfile::fillAccountStatus(const LLAvatarData* avatar_data) void LLPanelAvatarProfile::fillAccountStatus(const LLAvatarData* avatar_data)
{ {
LLStringUtil::format_map_t args; LLStringUtil::format_map_t args;
......
...@@ -177,11 +177,6 @@ class LLPanelAvatarProfile ...@@ -177,11 +177,6 @@ class LLPanelAvatarProfile
*/ */
virtual void fillPartnerData(const LLAvatarData* avatar_data); virtual void fillPartnerData(const LLAvatarData* avatar_data);
/**
* Fills Avatar's online status.
*/
virtual void fillOnlineStatus(const LLAvatarData* avatar_data);
/** /**
* Fills account status. * Fills account status.
*/ */
......
...@@ -198,8 +198,6 @@ void LLPanelMyProfileEdit::processProfileProperties(const LLAvatarData* avatar_d ...@@ -198,8 +198,6 @@ void LLPanelMyProfileEdit::processProfileProperties(const LLAvatarData* avatar_d
{ {
fillCommonData(avatar_data); fillCommonData(avatar_data);
fillOnlineStatus(avatar_data);
fillPartnerData(avatar_data); fillPartnerData(avatar_data);
fillAccountStatus(avatar_data); fillAccountStatus(avatar_data);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment