summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llpanelpicks.cpp43
-rw-r--r--indra/newview/llpanelpicks.h3
-rw-r--r--indra/newview/skins/default/xui/en/panel_picks.xml11
3 files changed, 0 insertions, 57 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 4abb60dded..cc6e88a9d2 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -61,7 +61,6 @@ static const std::string XML_BTN_DELETE = "trash_btn";
static const std::string XML_BTN_INFO = "info_btn";
static const std::string XML_BTN_TELEPORT = "teleport_btn";
static const std::string XML_BTN_SHOW_ON_MAP = "show_on_map_btn";
-static const std::string XML_BTN_OVERFLOW = "overflow_btn";
static const std::string PICK_ID("pick_id");
static const std::string PICK_CREATOR_ID("pick_creator_id");
@@ -113,7 +112,6 @@ LLPanelPicks::LLPanelPicks()
mClassifiedsList(NULL),
mPanelPickInfo(NULL),
mPanelPickEdit(NULL),
- mOverflowMenu(NULL),
mPlusMenu(NULL),
mPicksAccTab(NULL),
mClassifiedsAccTab(NULL),
@@ -273,7 +271,6 @@ BOOL LLPanelPicks::postBuild()
childSetAction(XML_BTN_TELEPORT, boost::bind(&LLPanelPicks::onClickTeleport, this));
childSetAction(XML_BTN_SHOW_ON_MAP, boost::bind(&LLPanelPicks::onClickMap, this));
childSetAction(XML_BTN_INFO, boost::bind(&LLPanelPicks::onClickInfo, this));
- childSetAction(XML_BTN_OVERFLOW, boost::bind(&LLPanelPicks::onOverflowButtonClicked, this));
mPicksAccTab = getChild<LLAccordionCtrlTab>("tab_picks");
mPicksAccTab->setDropDownStateChangedCallback(boost::bind(&LLPanelPicks::onAccordionStateChanged, this, mPicksAccTab));
@@ -291,10 +288,6 @@ BOOL LLPanelPicks::postBuild()
registar.add("Pick.Delete", boost::bind(&LLPanelPicks::onClickDelete, this));
mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_picks.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
- LLUICtrl::CommitCallbackRegistry::ScopedRegistrar overflow_registar;
- overflow_registar.add("PicksList.Overflow", boost::bind(&LLPanelPicks::onOverflowMenuItemClicked, this, _2));
- mOverflowMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_picks_overflow.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
-
LLUICtrl::CommitCallbackRegistry::ScopedRegistrar plus_registar;
plus_registar.add("Picks.Plus.Action", boost::bind(&LLPanelPicks::onPlusMenuItemClicked, this, _2));
mPlusMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_picks_plus.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
@@ -302,24 +295,6 @@ BOOL LLPanelPicks::postBuild()
return TRUE;
}
-void LLPanelPicks::onOverflowMenuItemClicked(const LLSD& param)
-{
- std::string value = param.asString();
-
- if("info" == value)
- {
- onClickInfo();
- }
- else if("teleport" == value)
- {
- onClickTeleport();
- }
- else if("map" == value)
- {
- onClickMap();
- }
-}
-
void LLPanelPicks::onPlusMenuItemClicked(const LLSD& param)
{
std::string value = param.asString();
@@ -348,23 +323,6 @@ void LLPanelPicks::onAccordionStateChanged(const LLAccordionCtrlTab* acc_tab)
updateButtons();
}
-void LLPanelPicks::onOverflowButtonClicked()
-{
- if (!mOverflowMenu->toggleVisibility())
- return;
-
- LLView* btn = getChild<LLView>(XML_BTN_OVERFLOW);
-
- if (mOverflowMenu->getButtonRect().isEmpty())
- {
- mOverflowMenu->setButtonRect(btn);
- }
- mOverflowMenu->updateParent(LLMenuGL::sMenuContainer);
-
- LLRect rect = btn->getRect();
- LLMenuGL::showPopup(this, mOverflowMenu, rect.mRight, rect.mTop);
-}
-
void LLPanelPicks::onOpen(const LLSD& key)
{
const LLUUID id(key.asUUID());
@@ -568,7 +526,6 @@ void LLPanelPicks::updateButtons()
childSetEnabled(XML_BTN_INFO, has_selected);
childSetEnabled(XML_BTN_TELEPORT, has_selected);
childSetEnabled(XML_BTN_SHOW_ON_MAP, has_selected);
- childSetEnabled(XML_BTN_OVERFLOW, has_selected);
}
void LLPanelPicks::setProfilePanel(LLPanelProfile* profile_panel)
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index b21b1c64b1..21794d56b2 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -94,8 +94,6 @@ private:
void onClickTeleport();
void onClickMap();
- void onOverflowMenuItemClicked(const LLSD& param);
- void onOverflowButtonClicked();
void onPlusMenuItemClicked(const LLSD& param);
void onListCommit(const LLFlatListView* f_list);
@@ -149,7 +147,6 @@ private:
LLPanelClassifiedInfo* mPanelClassifiedInfo;
LLPanelClassifiedEdit* mPanelClassifiedEdit;
LLPanelPickEdit* mPanelPickEdit;
- LLToggleableMenu* mOverflowMenu;
LLToggleableMenu* mPlusMenu;
LLAccordionCtrlTab* mPicksAccTab;
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 4f0d155876..4c2bd67337 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -162,16 +162,5 @@
tab_stop="false"
top="0"
width="50" />
- <button
- enabled="false"
- follows="bottom|right"
- height="25"
- label="▼"
- layout="topleft"
- name="overflow_btn"
- right="-10"
- tab_stop="false"
- top="0"
- width="30" />
</panel>
</panel>