diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 19:41:42 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 19:41:42 -0800 |
| commit | 6ac59fcceb17b25882b8c449e77f5bb06f0495c8 (patch) | |
| tree | c4c301bc5888e95ac2f9b02f99750643caa8d25a /indra/newview/llpanelnearbymedia.h | |
| parent | 9ac8fe6b19d5d92abf562c5dfcdc8499a69db6d9 (diff) | |
| parent | f6ef97dcbc30350ee0804d5bee0df654e5d847e6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelnearbymedia.h')
| -rw-r--r-- | indra/newview/llpanelnearbymedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h index 6fe724266b..4f864519f5 100644 --- a/indra/newview/llpanelnearbymedia.h +++ b/indra/newview/llpanelnearbymedia.h @@ -56,6 +56,7 @@ public: /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); /*virtual*/ void onTopLost (); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent); + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); // this is part of the nearby media *dialog* so we can track whether // the user *implicitly* wants audio on or off via their *explicit* @@ -149,7 +150,6 @@ private: void onClickSelectedMediaUnzoom(); LLUICtrl* mNearbyMediaPanel; - LLTextBox* mItemCountText; LLScrollListCtrl* mMediaList; LLUICtrl* mEnableAllCtrl; LLUICtrl* mDisableAllCtrl; |