summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2010-01-06 14:29:26 -0500
committerNat Goodspeed <nat@lindenlab.com>2010-01-06 14:29:26 -0500
commit657cbc3b74f0005290faf852e97d697296374566 (patch)
treec37c60962641816531e3d735a79df60b5b067e9b /indra/newview/llpanelteleporthistory.cpp
parent0f89155e295f632187704999d8ecc01f464a88d8 (diff)
parentaf61dd45b3afe8b62dceeb55a2ded7a9cfa34117 (diff)
Merge previously-unmerged product-engine commit
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
-rw-r--r--indra/newview/llpanelteleporthistory.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 245f694ac6..65a3d9d41b 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -1045,4 +1045,11 @@ void LLTeleportHistoryPanel::onAccordionExpand(LLUICtrl* ctrl, const LLSD& param
bool expanded = param.asBoolean();
// Save accordion tab state to restore it in refresh()
setAccordionCollapsedByUser(ctrl, !expanded);
+
+ // Reset selection upon accordion being collapsed
+ // to disable "Teleport" and "Map" buttons for hidden item.
+ if (!expanded && mLastSelectedFlatlList)
+ {
+ mLastSelectedFlatlList->resetSelection();
+ }
}