From 1c3cb11a7b19f6410994b0576ac51b6f7a7ba054 Mon Sep 17 00:00:00 2001
From: Sergey Borushevsky <sborushevsky@productengine.com>
Date: Thu, 5 Nov 2009 16:55:29 +0200
Subject: [PATCH] Fixed major bug EXT-2221 (Teleport History > List item >
Arrow button should open Place Profile, not teleport) Fixed major bug
EXT-2222 (Remove (i) inspector icon from Places > Teleport History > item)
Fixed major bug EXT-2223 (Places > Teleport History > Arrow icon should only
appear on mouseover)
Actually it's just replacing image for right-side button on history item.
--HG--
branch : product-engine
---
indra/newview/llpanelteleporthistory.cpp | 16 +++++++++-------
.../xui/en/panel_teleport_history_item.xml | 11 +----------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 437af1c4e71..a34f029095b 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -71,9 +71,10 @@ class LLTeleportHistoryFlatItem : public LLPanel
static void showPlaceInfoPanel(S32 index);
private:
- void onInfoBtnClick();
+ void onProfileBtnClick();
- LLButton* mInfoBtn;
+ LLButton* mProfileBtn;
+
LLTeleportHistoryPanel::ContextMenu *mContextMenu;
S32 mIndex;
@@ -95,8 +96,9 @@ BOOL LLTeleportHistoryFlatItem::postBuild()
LLTextBox *region = getChild<LLTextBox>("region");
region->setValue(mRegionName);
- mInfoBtn = getChild<LLButton>("info_btn");
- mInfoBtn->setClickedCallback(boost::bind(&LLTeleportHistoryFlatItem::onInfoBtnClick, this));
+ mProfileBtn = getChild<LLButton>("profile_btn");
+
+ mProfileBtn->setClickedCallback(boost::bind(&LLTeleportHistoryFlatItem::onProfileBtnClick, this));
return true;
}
@@ -111,7 +113,7 @@ void LLTeleportHistoryFlatItem::setValue(const LLSD& value)
void LLTeleportHistoryFlatItem::onMouseEnter(S32 x, S32 y, MASK mask)
{
childSetVisible("hovered_icon", true);
- mInfoBtn->setVisible(true);
+ mProfileBtn->setVisible(true);
LLPanel::onMouseEnter(x, y, mask);
}
@@ -119,7 +121,7 @@ void LLTeleportHistoryFlatItem::onMouseEnter(S32 x, S32 y, MASK mask)
void LLTeleportHistoryFlatItem::onMouseLeave(S32 x, S32 y, MASK mask)
{
childSetVisible("hovered_icon", false);
- mInfoBtn->setVisible(false);
+ mProfileBtn->setVisible(false);
LLPanel::onMouseLeave(x, y, mask);
}
@@ -142,7 +144,7 @@ void LLTeleportHistoryFlatItem::showPlaceInfoPanel(S32 index)
LLSideTray::getInstance()->showPanel("panel_places", params);
}
-void LLTeleportHistoryFlatItem::onInfoBtnClick()
+void LLTeleportHistoryFlatItem::onProfileBtnClick()
{
LLTeleportHistoryFlatItem::showPlaceInfoPanel(mIndex);
}
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 0073a1f1a0d..1f67a0a7328 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
@@ -47,16 +47,6 @@
top="4"
value="..."
width="242" />
- <button
- follows="right"
- height="16"
- image_pressed="Info_Press"
- image_unselected="Info_Over"
- left_pad="3"
- right="-31"
- name="info_btn"
- top_delta="-2"
- width="16" />
<button
follows="right"
height="20"
@@ -66,5 +56,6 @@
right="-3"
name="profile_btn"
top_delta="-2"
+ visible="false"
width="20" />
</panel>
--
GitLab