3 files changed, 10 insertions, 16 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)
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
index ebba25cfa5..ecbe281b7a 100644
--- a/indra/newview/llpanelteleporthistory.h
+++ b/indra/newview/llpanelteleporthistory.h
@@ -78,7 +78,10 @@ public:
 
 private:
 
-	static void onDoubleClickItem(void* user_data);
+	void onDoubleClickItem();
+	void onAccordionTabRightClick(LLView *view, S32 x, S32 y, MASK mask);
+	void onAccordionTabOpen(LLAccordionCtrlTab *tab);
+	void onAccordionTabClose(LLAccordionCtrlTab *tab);
 	void onAccordionTabRightClick(LLView *view, S32 x, S32 y, MASK mask);
 	void onAccordionTabOpen(LLAccordionCtrlTab *tab);
 	void onAccordionTabClose(LLAccordionCtrlTab *tab);
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index bb37f43220..d640d3ad88 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -42,11 +42,12 @@
      height="20"
      layout="topleft"
      left_pad="5"
+     use_ellipsis="true"
      name="region"
      text_color="white"
      top="4"
      value="Unknown"
-     width="380" />
+     width="330" />
     <button
      follows="right"
      height="18"