diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 22:09:08 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 22:09:08 +0000 |
commit | 4a9b231dcc342bfd9cf570ff70d25909cda251cd (patch) | |
tree | 5d54b90d9fa5d2ba58b92a74f9e4a9cd1d16868f /indra/newview/llpanelnearbymedia.h | |
parent | 1c67e8f386d69e06c1ff820eb551b3c69592ff89 (diff) | |
parent | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff) |
viewer2 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; }; |