diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 21:51:25 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 21:51:25 -0800 |
| commit | 2f785135bc39575ec306b2b057e446e61c5369d7 (patch) | |
| tree | 8c2e6a03962b24700694c6887dacd1558df7cde9 /indra/newview/llpanelnearbymedia.h | |
| parent | 31e4b6e79ccd0a0451de3fa6a487f775d9f45497 (diff) | |
| parent | b214180ac189f6c6347347c5d3a5dc7035e0c039 (diff) | |
Merge with viewer 2.
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; |