diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-27 08:10:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-27 08:10:29 -0400 |
commit | 5ed8ec6ca45fcae6a6708e55326010fd8c05d76c (patch) | |
tree | 433af79631cf0f386c6cf991cb01e119d5187009 /indra/newview/llsidepaneltaskinfo.cpp | |
parent | a4913246770b58ed569021c484c213231aaae549 (diff) | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) |
merge up to 3.3.3-release
Diffstat (limited to 'indra/newview/llsidepaneltaskinfo.cpp')
-rw-r--r-- | indra/newview/llsidepaneltaskinfo.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp index 24cb559fd0..64b82aa0bb 100644 --- a/indra/newview/llsidepaneltaskinfo.cpp +++ b/indra/newview/llsidepaneltaskinfo.cpp @@ -94,7 +94,7 @@ BOOL LLSidepanelTaskInfo::postBuild() mPayBtn = getChild<LLButton>("pay_btn"); mPayBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onPayButtonClicked, this)); mBuyBtn = getChild<LLButton>("buy_btn"); - mBuyBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onBuyButtonClicked, this)); + mBuyBtn->setClickedCallback(boost::bind(&handle_buy)); mDetailsBtn = getChild<LLButton>("details_btn"); mDetailsBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onDetailsButtonClicked, this)); @@ -1114,8 +1114,6 @@ void LLSidepanelTaskInfo::doClickAction(U8 click_action) // Set click action back to its old value U8 click_action = 0; LLSelectMgr::getInstance()->selectionGetClickAction(&click_action); -// box->setCurrentByIndex((S32)click_action); - return; } } |