diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-25 12:53:02 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-25 12:53:02 +0200 |
| commit | 74b3c9e0e5cbcb2c34ae0f8dd2d0186826a227da (patch) | |
| tree | 4042b73d7938f19470e0f11928f6eb50557966d5 /indra/newview/llpanelprofileview.h | |
| parent | 6ffc21e00d07a7c90d46009571556a9caec96e62 (diff) | |
Fixed normal bug EXT-3880 ( [BSI] functionality loss - online status in profile)
-- removed logic implemented for EXT-2022 (show "Online" status or nothing)
-- removed deprecated method LLPanelProfileView::togglePanel
-- implemented required bihavior (for friends):
--- Online when online and privacy settings allow to show
--- Offline when offline and privacy settings allow to show
--- Else: nothing
-- also implemented bihavior for non-friends to use global Preference: "Only Friends & Groups can see when I am online"
--- Online when online and was not set in Preferences/"Only Friends & Groups can see when I am online"
--- Else: Offline
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelprofileview.h')
| -rw-r--r-- | indra/newview/llpanelprofileview.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/indra/newview/llpanelprofileview.h b/indra/newview/llpanelprofileview.h index 5dc617d4a0..9b87e146a8 100644 --- a/indra/newview/llpanelprofileview.h +++ b/indra/newview/llpanelprofileview.h @@ -64,8 +64,6 @@ public: /*virtual*/ BOOL postBuild(); - /*virtual*/ void togglePanel(LLPanel* panel, const LLSD& key = LLSD()); - BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, @@ -81,8 +79,21 @@ public: protected: void onBackBtnClick(); - bool isGrantedToSeeOnlineStatus(); // deprecated after EXT-2022 is implemented - void updateOnlineStatus(); // deprecated after EXT-2022 is implemented + bool isGrantedToSeeOnlineStatus(); + + /** + * Displays avatar's online status if possible. + * + * Requirements from EXT-3880: + * For friends: + * - Online when online and privacy settings allow to show + * - Offline when offline and privacy settings allow to show + * - Else: nothing + * For other avatars: + * - Online when online and was not set in Preferences/"Only Friends & Groups can see when I am online" + * - Else: Offline + */ + void updateOnlineStatus(); void processOnlineStatus(bool online); private: @@ -96,7 +107,6 @@ private: LLTextBox* mStatusText; AvatarStatusObserver* mAvatarStatusObserver; - bool mAvatarIsOnline; }; #endif //LL_LLPANELPROFILEVIEW_H |