diff options
| author | James Cook <james@lindenlab.com> | 2010-05-13 15:47:32 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-13 15:47:32 -0700 |
| commit | 8b524549902b780c2833691368bc35bdb1837cd9 (patch) | |
| tree | b742a7f5463fb42663fa51e1029c80671ceb881b /indra/newview/llpanelteleporthistory.cpp | |
| parent | 14f423a23c38bf554e9633752074fbcabd92599c (diff) | |
| parent | aebb49520b1919e0ac2bcc7373fc2db031e3b7f0 (diff) | |
merge pull from dessie/viewer-public, picking up SLE code
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
| -rw-r--r-- | indra/newview/llpanelteleporthistory.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp index c0b2244038..e8b6c6bfe5 100644 --- a/indra/newview/llpanelteleporthistory.cpp +++ b/indra/newview/llpanelteleporthistory.cpp @@ -477,6 +477,12 @@ void LLTeleportHistoryPanel::onSearchEdit(const std::string& string) } // virtual +bool LLTeleportHistoryPanel::isSingleItemSelected() +{ + return mLastSelectedFlatlList && mLastSelectedFlatlList->getSelectedItem(); +} + +// virtual void LLTeleportHistoryPanel::onShowOnMap() { if (!mLastSelectedFlatlList) @@ -557,7 +563,6 @@ void LLTeleportHistoryPanel::updateVerbs() if (!mLastSelectedFlatlList) { mTeleportBtn->setEnabled(false); - mShowOnMapBtn->setEnabled(false); mShowProfile->setEnabled(false); return; } @@ -565,8 +570,8 @@ void LLTeleportHistoryPanel::updateVerbs() LLTeleportHistoryFlatItem* itemp = dynamic_cast<LLTeleportHistoryFlatItem *> (mLastSelectedFlatlList->getSelectedItem()); mTeleportBtn->setEnabled(NULL != itemp); - mShowOnMapBtn->setEnabled(NULL != itemp); mShowProfile->setEnabled(NULL != itemp); + mShowOnMapBtn->setEnabled(true); } void LLTeleportHistoryPanel::getNextTab(const LLDate& item_date, S32& tab_idx, LLDate& tab_date) |