1 files changed, 62 insertions, 17 deletions

diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 1d16c4ef5e..044036ea50 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -32,10 +32,12 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llavatarconstants.h"
 #include "lluserrelations.h"
 
 #include "llpanelprofileview.h"
 
+#include "llavatarpropertiesprocessor.h"
 #include "llcallingcard.h"
 #include "llpanelavatar.h"
 #include "llpanelpicks.h"
@@ -48,14 +50,46 @@ static std::string PANEL_NOTES = "panel_notes";
 static const std::string PANEL_PROFILE = "panel_profile";
 static const std::string PANEL_PICKS = "panel_picks";
 
+
+class AvatarStatusObserver : public LLAvatarPropertiesObserver
+{
+public:
+	AvatarStatusObserver(LLPanelProfileView* profile_view)
+	{
+		mProfileView = profile_view;
+	}
+
+	void processProperties(void* data, EAvatarProcessorType type)
+	{
+		if(APT_PROPERTIES != type) return;
+		const LLAvatarData* avatar_data = static_cast<const LLAvatarData*>(data);
+		if(avatar_data && mProfileView->getAvatarId() == avatar_data->avatar_id)
+		{
+			mProfileView->processOnlineStatus(avatar_data->flags & AVATAR_ONLINE);
+			LLAvatarPropertiesProcessor::instance().removeObserver(mProfileView->getAvatarId(), this);
+		}
+	}
+
+	void subscribe()
+	{
+		LLAvatarPropertiesProcessor::instance().addObserver(mProfileView->getAvatarId(), this);
+	}
+
+private:
+	LLPanelProfileView* mProfileView;
+};
+
 LLPanelProfileView::LLPanelProfileView()
 :	LLPanelProfile()
 ,	mStatusText(NULL)
+,	mAvatarStatusObserver(NULL)
 {
+	mAvatarStatusObserver = new AvatarStatusObserver(this);
 }
 
 LLPanelProfileView::~LLPanelProfileView(void)
 {
+	delete mAvatarStatusObserver;
 }
 
 /*virtual*/ 
@@ -66,6 +100,7 @@ void LLPanelProfileView::onOpen(const LLSD& key)
 	{
 		id = key["id"];
 	}
+
 	if(id.notNull() && getAvatarId() != id)
 	{
 		setAvatarId(id);
@@ -75,10 +110,9 @@ void LLPanelProfileView::onOpen(const LLSD& key)
 	gCacheName->get(getAvatarId(), FALSE,
 		boost::bind(&LLPanelProfileView::onAvatarNameCached, this, _1, _2, _3, _4));
 
-	// status should only show if viewer has permission to view online/offline. EXT-453 
-	mStatusText->setVisible(isGrantedToSeeOnlineStatus());
 	updateOnlineStatus();
 
+
 	LLPanelProfile::onOpen(key);
 }
 
@@ -93,6 +127,7 @@ BOOL LLPanelProfileView::postBuild()
 	getTabContainer()[PANEL_PROFILE]->childSetVisible("status_combo", FALSE);
 
 	mStatusText = getChild<LLTextBox>("status");
+	mStatusText->setVisible(false);
 
 	childSetCommitCallback("back",boost::bind(&LLPanelProfileView::onBackBtnClick,this),NULL);
 	
@@ -124,19 +159,40 @@ bool LLPanelProfileView::isGrantedToSeeOnlineStatus()
 	// *NOTE: GRANT_ONLINE_STATUS is always set to false while changing any other status.
 	// When avatar disallow me to see her online status processOfflineNotification Message is received by the viewer
 	// see comments for ChangeUserRights template message. EXT-453.
-//	return relationship->isRightGrantedFrom(LLRelationship::GRANT_ONLINE_STATUS);
-	return true;
+	// If GRANT_ONLINE_STATUS flag is changed it will be applied when viewer restarts. EXT-3880
+	return relationship->isRightGrantedFrom(LLRelationship::GRANT_ONLINE_STATUS);
 }
 
+// method was disabled according to EXT-2022. Re-enabled & improved according to EXT-3880
 void LLPanelProfileView::updateOnlineStatus()
 {
+	// set text box visible to show online status for non-friends who has not set in Preferences
+	// "Only Friends & Groups can see when I am online"
+	mStatusText->setVisible(TRUE);
+
 	const LLRelationship* relationship = LLAvatarTracker::instance().getBuddyInfo(getAvatarId());
 	if (NULL == relationship)
+	{
+		// this is non-friend avatar. Status will be updated from LLAvatarPropertiesProcessor.
+		// in LLPanelProfileView::processOnlineStatus()
+
+		// subscribe observer to get online status. Request will be sent by LLPanelAvatarProfile itself.
+		// do not subscribe for friend avatar because online status can be wrong overridden
+		// via LLAvatarData::flags if Preferences: "Only Friends & Groups can see when I am online" is set.
+		mAvatarStatusObserver->subscribe();
 		return;
+	}
+	// For friend let check if he allowed me to see his status
+
+	// status should only show if viewer has permission to view online/offline. EXT-453, EXT-3880
+	mStatusText->setVisible(isGrantedToSeeOnlineStatus());
 
 	bool online = relationship->isOnline();
-//	std::string statusName();
+	processOnlineStatus(online);
+}
 
+void LLPanelProfileView::processOnlineStatus(bool online)
+{
 	std::string status = getString(online ? "status_online" : "status_offline");
 
 	mStatusText->setValue(status);
@@ -145,18 +201,7 @@ void LLPanelProfileView::updateOnlineStatus()
 void LLPanelProfileView::onAvatarNameCached(const LLUUID& id, const std::string& first_name, const std::string& last_name, BOOL is_group)
 {
 	llassert(getAvatarId() == id);
-	getChild<LLTextBox>("user_name", FALSE)->setValue(first_name + " " + last_name);
-}
-
-void LLPanelProfileView::togglePanel(LLPanel* panel)
-{
-	LLPanelProfile::togglePanel(panel);
-	if(FALSE == panel->getVisible())
-	{
-		// LLPanelProfile::togglePanel shows/hides all children,
-		// we don't want to display online status for non friends, so re-hide it here
-		mStatusText->setVisible(isGrantedToSeeOnlineStatus());
-	}
+	getChild<LLUICtrl>("user_name", FALSE)->setValue(first_name + " " + last_name);
 }
 
 // EOF