diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-05 07:44:18 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-05 07:44:18 +0000 |
| commit | 2451b82d8ac45c12f4b3ba821ca102cdfbecf36c (patch) | |
| tree | ba94d4aa3cc71bc33303b17e83cccd09f058c75a /indra/newview/llpanelteleporthistory.cpp | |
| parent | 8b8dfa2e2b19354345c88515732c75e2576f516b (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1887 https://svn.aws.productengine.com/secondlife/pe/stable-2@1888 -> viewer-2.0.0-3
* Bugs: EXT-1148
* New Dev: EXT-1140
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
| -rw-r--r-- | indra/newview/llpanelteleporthistory.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp index 9754094aaa..bc0dec1fdb 100644 --- a/indra/newview/llpanelteleporthistory.cpp +++ b/indra/newview/llpanelteleporthistory.cpp @@ -261,7 +261,7 @@ BOOL LLTeleportHistoryPanel::postBuild() if (fl) { fl->setCommitOnSelectionChange(true); - //fl->setDoubleClickCallback(onDoubleClickItem, this); + fl->setDoubleClickCallback(boost::bind(&LLTeleportHistoryPanel::onDoubleClickItem, this)); fl->setCommitCallback(boost::bind(&LLTeleportHistoryPanel::handleItemSelect, this, fl)); } } @@ -497,20 +497,10 @@ void LLTeleportHistoryPanel::handleItemSelect(LLFlatListView* selected) updateVerbs(); } -//static -void LLTeleportHistoryPanel::onDoubleClickItem(void* user_data) +void LLTeleportHistoryPanel::onDoubleClickItem() { - /*LLTeleportHistoryPanel* self = (LLTeleportHistoryPanel*)user_data; - - LLScrollListItem* itemp = self->mHistoryItems->getFirstSelected(); - if(!itemp) - return; - - LLSD key; - key["type"] = "teleport_history"; - key["id"] = itemp->getColumn(LIST_INDEX)->getValue().asInteger(); - - LLSideTray::getInstance()->showPanel("panel_places", key);*/ + // If item got doubleclick, then that item is already selected + onTeleport(); } void LLTeleportHistoryPanel::onAccordionTabRightClick(LLView *view, S32 x, S32 y, MASK mask) |