diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:32:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:32:57 -0500 |
| commit | cb6d59513eabe72029821a96191873351fd5c753 (patch) | |
| tree | ed311d11da22ab8d1aff695166d0ca38d269ccae /indra/newview/llpanelnearbymedia.cpp | |
| parent | d0b5e6b0b4acebd1b11685dea290b830957ba9dc (diff) | |
| parent | bbb4fb10a50495669ec5d49da4a39950a5e2042d (diff) | |
merge changes for storm-829
Diffstat (limited to 'indra/newview/llpanelnearbymedia.cpp')
| -rw-r--r-- | indra/newview/llpanelnearbymedia.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index fcc67d6840..14e39f2c48 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -958,7 +958,7 @@ void LLPanelNearByMedia::onAdvancedButtonClick() void LLPanelNearByMedia::onMoreLess() { - bool is_more = getChild<LLUICtrl>("more_btn")->getVisible(); + bool is_more = getChild<LLButton>("more_btn")->getToggleState(); mNearbyMediaPanel->setVisible(is_more); // enable resizing when expanded @@ -969,8 +969,7 @@ void LLPanelNearByMedia::onMoreLess() setShape(new_rect); - getChild<LLUICtrl>("more_btn")->setVisible(!is_more); - getChild<LLUICtrl>("less_btn")->setVisible(is_more); + getChild<LLUICtrl>("more_btn")->setVisible(true); } void LLPanelNearByMedia::updateControls() |