diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-22 14:15:58 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-22 14:15:58 -0500 |
commit | bd84d36c9d08878c895c896e097e8e3310b61cf3 (patch) | |
tree | e2e333ba15c131dfb25c4baf54bcb98fd2a3bd46 /indra/newview/llpanelnearbymedia.h | |
parent | 00fdc0acd5e27d353c070706e838a35bf889a536 (diff) | |
parent | 04712617c55c53dbec1f73a4e8834ebe3167e5ed (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelnearbymedia.h')
-rw-r--r-- | indra/newview/llpanelnearbymedia.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h index eedfd447de..6fe724266b 100644 --- a/indra/newview/llpanelnearbymedia.h +++ b/indra/newview/llpanelnearbymedia.h @@ -174,11 +174,11 @@ private: std::string mParcelMediaName; std::string mParcelAudioName; - S32 mMoreHeight; - S32 mLessHeight; - LLFrameTimer mHoverTimer; - LLScrollListItem* mParcelMediaItem; - LLScrollListItem* mParcelAudioItem; + LLRect mMoreRect; + LLRect mLessRect; + LLFrameTimer mHoverTimer; + LLScrollListItem* mParcelMediaItem; + LLScrollListItem* mParcelAudioItem; }; |